From a5d13ffc7494ae7c416202aa18e2ada8d9eca46f Mon Sep 17 00:00:00 2001 From: brantje Date: Sat, 5 Aug 2017 12:56:08 +0200 Subject: [PATCH] Revert "Fix some NG-Shows. Add PR #148 to scss". Causes way too much problems with existing code. This reverts commit 6cc376312913ee556ac70a382a78fa45e30fcc01. --- css/browser_action.css | 8 ++-- .../browser_action/views/edit_credential.html | 2 +- html/browser_action/views/list.html | 2 +- style/browser_action.scss | 41 +++++++------------ 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/css/browser_action.css b/css/browser_action.css index 454034f..dfb78a6 100644 --- a/css/browser_action.css +++ b/css/browser_action.css @@ -560,7 +560,7 @@ body.toggled { left: 250px; width: 0; height: 100%; - margin-left: -249px; + margin-left: -251px; overflow: hidden; background: #fff; -webkit-transition: all 0.250s ease; @@ -584,6 +584,8 @@ body.toggled { margin-right: -250px; /* width: calc(100% - 250px);*/ } + + /* Sidebar Styles */ .sidebar-nav { position: absolute; @@ -652,11 +654,11 @@ body.toggled { top: 0; visibility: visible; opacity: 1; - transition: visibility 250ms, opacity 250ms ease; } + transition: visibility 250ms, opacity 250ms ease;} .ng-hide { visibility: hidden; - opacity: 0; } + opacity: 0;} .edit_credential { padding-top: 30px; diff --git a/html/browser_action/views/edit_credential.html b/html/browser_action/views/edit_credential.html index 869d63c..81f3e78 100644 --- a/html/browser_action/views/edit_credential.html +++ b/html/browser_action/views/edit_credential.html @@ -50,7 +50,7 @@ -
+
{{ 'edit_insufficient_permissions' | translate }}
diff --git a/html/browser_action/views/list.html b/html/browser_action/views/list.html index 0d04d00..2489b1a 100644 --- a/html/browser_action/views/list.html +++ b/html/browser_action/views/list.html @@ -1,5 +1,5 @@
-
+
{{ 'no_credentials_found_for_site' | translate}}
diff --git a/style/browser_action.scss b/style/browser_action.scss index 6a2f731..49147f3 100644 --- a/style/browser_action.scss +++ b/style/browser_action.scss @@ -9,7 +9,7 @@ $sidebarWidth: 250px; body { - &.setup { + &.setup{ width: 100%; } width: 450px; @@ -48,12 +48,12 @@ body.toggled { } #sidebar-wrapper { - z-index: 10000; + z-index: 1000; position: fixed; left: $sidebarWidth; width: 0; height: 100%; - margin-left: -$sidebarWidth+1; + margin-left: -$sidebarWidth; overflow: hidden; background: #fff; -webkit-transition: all 0.250s ease; @@ -81,6 +81,9 @@ body.toggled { /* width: calc(100% - 250px);*/ } +.ng-hide { + display: none; +} /* Sidebar Styles */ @@ -157,20 +160,12 @@ body.toggled { .menuToggler { position: fixed; - background-color: rgba(0, 0, 0, 0.6); - width: 100%; + background-color: rgba(0,0,0,0.6); + width: calc(100% - 250px); height: 100%; - z-index: 1000; + z-index: 9999999; right: 0; top: 0; - visibility: visible; - opacity: 1; - transition: visibility 250ms, opacity 250ms ease; -} - -.ng-hide { - visibility: hidden; - opacity: 0; } .edit_credential { @@ -263,7 +258,7 @@ label, .switch-label, label:not(.input-checkbox):not(.label) { } } -.tab-wrap .tab-label-content.account .tab-content.active { +.tab-wrap .tab-label-content.account .tab-content.active{ margin-top: 10px; } @@ -277,17 +272,16 @@ label, .switch-label, label:not(.input-checkbox):not(.label) { height: 40px; line-height: 40px; padding: 0; - background-color: #1565c0; + background-color: #1565c0; border-radius: 50%; transition: .3s; cursor: pointer; vertical-align: middle; } - .btn, .btn-large { text-decoration: none; color: #fff; - background-color: #1565c0; + background-color: #1565c0; text-align: center; letter-spacing: .5px; transition: .2s ease-out; @@ -297,25 +291,20 @@ label, .switch-label, label:not(.input-checkbox):not(.label) { height: 56px; line-height: 54px; } - -.btn:hover, .btn-large:hover { - background-color: lighten(#1565c0, 20%); +.btn:hover, .btn-large:hover{ + background-color: lighten(#1565c0, 20%) ; } - -.fab { +.fab{ position: fixed; bottom: 20px; right: 20px; } - .red { background-color: #F44336 !important; } - .cg-notify-message-center { left: 112px !important; } - .version { padding-bottom: 10px; padding-left: 15px;