diff options
| author | Dirk Brenken <dev@brenken.org> | 2018-12-27 07:24:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-27 07:24:28 +0100 |
| commit | be24925159f7eb87941562360de5e9728183e2b1 (patch) | |
| tree | e893d31c2503e6a0fa46b36675ed37ab81df2b7d | |
| parent | 0fb3bb61df8ca4cdda9d98c3c814000d6b106a35 (diff) | |
| parent | a6b19ce5e45dbf070a9092ed5c23a8d0dbd259cc (diff) | |
Merge pull request #2402 from dibdot/travelmate
luci-app-travelmate: adapt latest css changes
| -rw-r--r-- | applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua | 3 | ||||
| -rw-r--r-- | applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index e98cde719c..5792536ba1 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -76,7 +76,8 @@ if dump then local i, v for i, v in ipairs(dump.interface) do if v.interface ~= "loopback" and v.interface ~= "lan" then - o4:value(v.interface) + local device = v.l3_device or v.device or "-" + o4:value(v.interface, v.interface.. " (" ..device.. ")") end end end diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm index 14afe3997f..36b0081865 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm @@ -1,8 +1,8 @@ <style type="text/css"> textarea { - width: 100%; - height: 450px; + width: 100% !important; + height: 450px !important; border: 1px solid #cccccc; padding: 5px; font-size: 12px; @@ -16,8 +16,8 @@ select[readonly], textarea[readonly] { - width: 100%; - height: 450px; + width: 100% !important; + height: 450px !important; border: 1px solid #cccccc; padding: 5px; font-size: 12px; @@ -33,7 +33,7 @@ .cbi-section-table-row, .tr[data-title]::before { - text-align: left; + text-align: left !important; vertical-align: top; margin-left: 0px; padding-left: 2px; |