Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6470)

Unified Diff: chrome/browser/resources/options2/options_page.css

Issue 9513016: uber managed pref banners (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed merge Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_page.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/options_page.css
diff --git a/chrome/browser/resources/options2/options_page.css b/chrome/browser/resources/options2/options_page.css
index 72bb69a12526496edafa0b9170695d26e95b5a6a..79e0905a47536b91cc63464c3fbcc9a8005f3c4b 100644
--- a/chrome/browser/resources/options2/options_page.css
+++ b/chrome/browser/resources/options2/options_page.css
@@ -42,24 +42,6 @@ html.hide-menu #mainview {
min-width: 600px;
}
-#page-container .page {
- -webkit-transition-duration: 200ms;
- -webkit-transition-property: margin-top;
-}
-
-#page-container .page.under-managed-prefs-banner {
- margin-top: 31px;
-}
-
-#page-container header {
- -webkit-transition-duration: 200ms;
- -webkit-transition-property: top;
-}
-
-#page-container .page.under-managed-prefs-banner header {
- top: 31px;
-}
-
div.disabled {
color: #888;
}
@@ -177,43 +159,47 @@ html[touch-optimized] body {
}
.managed-prefs-banner {
- -webkit-transition-duration: 200ms;
- -webkit-transition-property: height;
- background: -webkit-linear-gradient(rgb(255, 242, 183),
- rgb(250, 230, 145) 97%,
- rgb(135, 135, 135));
- height: 31px;
- margin: 0;
- padding: 0;
- position: fixed;
- vertical-align: middle;
+ background-color: white;
width: 100%;
z-index: 2;
}
-.managed-prefs-banner[hidden] {
- height: 0;
+.page:not(.showing-banner) .managed-prefs-banner {
+ display: none;
}
-.managed-prefs-banner.clickable:active {
- background: -webkit-linear-gradient(rgb(135, 135, 135),
- rgb(250, 230, 145) 3%,
- rgb(255, 242, 183));
+.managed-prefs-gradient {
+ background: -webkit-linear-gradient(rgb(255, 242, 183),
+ rgb(250, 230, 145));
+ border: 1px solid rgb(201, 189, 141);
+ border-radius: 3px;
+ height: 25px;
+ margin: 9px 9px 0 9px;
}
-.managed-prefs-icon {
+.main-page-banner .managed-prefs-gradient {
+ -webkit-margin-end: 100px;
+ -webkit-margin-start: 0;
+ margin-bottom: 9px;
+ margin-top: 0;
+}
+
+.managed-prefs-text {
background-image: url('chrome://theme/IDR_WARNING');
- background-position: center;
+ background-position: 3px center;
background-repeat: no-repeat;
- display: inline-block;
- height: 21px;
- padding: 5px;
- vertical-align: middle;
- width: 24px;
+ display: block;
+ line-height: 25px;
+ padding-left: 31px;
}
-.managed-prefs-text {
- vertical-align: middle;
+.managed-prefs-banner.clickable:active .managed-prefs-text {
+ background: -webkit-linear-gradient(rgb(250, 230, 145),
+ rgb(255, 242, 183));
+}
+
+#page-container .page.showing-banner {
+ margin-top: 36px;
}
.overlay .page h1 {
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698