GUACAMOLE-220: Add semantic CSS class for headers having corresponding tabs.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/861bddea Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/861bddea Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/861bddea Branch: refs/heads/staging/1.0.0 Commit: 861bddea6db932dec5386988d9657a613fd782c0 Parents: edcb2af Author: Michael Jumper <mjum...@apache.org> Authored: Sat Jul 21 01:11:24 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Sat Jul 21 14:22:51 2018 -0700 ---------------------------------------------------------------------- guacamole/src/main/webapp/app/index/styles/headers.css | 4 ++++ guacamole/src/main/webapp/app/manage/styles/manage-user.css | 4 ---- guacamole/src/main/webapp/app/manage/templates/manageUser.html | 2 +- guacamole/src/main/webapp/app/settings/styles/settings.css | 4 ---- guacamole/src/main/webapp/app/settings/templates/settings.html | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/861bddea/guacamole/src/main/webapp/app/index/styles/headers.css ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/index/styles/headers.css b/guacamole/src/main/webapp/app/index/styles/headers.css index 2e813f4..b4d96f6 100644 --- a/guacamole/src/main/webapp/app/index/styles/headers.css +++ b/guacamole/src/main/webapp/app/index/styles/headers.css @@ -74,6 +74,10 @@ h2 { } +.header.tabbed { + margin-bottom: 0; +} + .header ~ * .header, .header ~ .header { margin-top: 1em; http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/861bddea/guacamole/src/main/webapp/app/manage/styles/manage-user.css ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/styles/manage-user.css b/guacamole/src/main/webapp/app/manage/styles/manage-user.css index cc0cd5c..d54c6b3 100644 --- a/guacamole/src/main/webapp/app/manage/styles/manage-user.css +++ b/guacamole/src/main/webapp/app/manage/styles/manage-user.css @@ -17,10 +17,6 @@ * under the License. */ -.manage-user .username.header { - margin-bottom: 0; -} - .manage-user .page-tabs .page-list li.read-only a[href], .manage-user .page-tabs .page-list li.unlinked a[href], .manage-user .page-tabs .page-list li.linked a[href] { http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/861bddea/guacamole/src/main/webapp/app/manage/templates/manageUser.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUser.html b/guacamole/src/main/webapp/app/manage/templates/manageUser.html index 660554b..bb5cfb3 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageUser.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageUser.html @@ -2,7 +2,7 @@ <div class="manage-user view" ng-class="{loading: !isLoaded()}"> <!-- User header and data source tabs --> - <div class="username header"> + <div class="header tabbed"> <h2>{{'MANAGE_USER.SECTION_HEADER_EDIT_USER' | translate}}</h2> <guac-user-menu></guac-user-menu> </div> http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/861bddea/guacamole/src/main/webapp/app/settings/styles/settings.css ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/settings/styles/settings.css b/guacamole/src/main/webapp/app/settings/styles/settings.css index ee59cae..390a793 100644 --- a/guacamole/src/main/webapp/app/settings/styles/settings.css +++ b/guacamole/src/main/webapp/app/settings/styles/settings.css @@ -17,10 +17,6 @@ * under the License. */ -.settings .header { - margin-bottom: 0; -} - .settings table.properties th { text-align: left; font-weight: normal; http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/861bddea/guacamole/src/main/webapp/app/settings/templates/settings.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/settings/templates/settings.html b/guacamole/src/main/webapp/app/settings/templates/settings.html index eec1f97..b29d809 100644 --- a/guacamole/src/main/webapp/app/settings/templates/settings.html +++ b/guacamole/src/main/webapp/app/settings/templates/settings.html @@ -1,7 +1,7 @@ <div class="view"> - <div class="header"> + <div class="header tabbed"> <h2>{{'SETTINGS.SECTION_HEADER_SETTINGS' | translate}}</h2> <guac-user-menu></guac-user-menu> </div>
