summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-11-09 01:06:33 (GMT)
committerAlex Pott2014-11-09 01:06:33 (GMT)
commitf6fb464736fed1fd115860fdc9c0620149d42ddd (patch)
tree289e269bf93b60745c0da485c35c2f957b4206c4
parentc0683a41657893c57b9c4badaacda2da1d557968 (diff)
Issue #2278415 by G-raph, Upchuk, Karmen, JamesLefrère, herom | emma.maria: Fixed Bartik dropbutton styling looks bad.
-rw-r--r--core/themes/bartik/css/style.css125
-rw-r--r--core/themes/bartik/images/buttons.pngbin831 -> 0 bytes
2 files changed, 112 insertions, 13 deletions
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 76ec800..d53b0e2 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -1404,9 +1404,11 @@ div.messages {
/* ---------------- Buttons ---------------- */
.button {
- background: #fff url(../images/buttons.png) 0 0 repeat-x;
+ background-color: #fff;
+ background-image: -webkit-linear-gradient(top, #f3f3f3, #e8e8e8);
+ background-image: linear-gradient(to bottom, #f3f3f3, #e8e8e8);
border: 1px solid #e4e4e4;
- border-bottom: 1px solid #b4b4b4;
+ border-bottom-color: #b4b4b4;
border-left-color: #d2d2d2;
border-right-color: #d2d2d2;
color: #3a3a3a;
@@ -1414,8 +1416,8 @@ div.messages {
font-size: 0.929em;
font-weight: normal;
text-align: center;
- padding: 4px 17px;
- border-radius: 15px;
+ padding: 0.250em 1.063em;
+ border-radius: 1em;
}
.button:hover,
.button:active,
@@ -1892,18 +1894,115 @@ div.admin-panel .description {
}
/* ---------- Dropbutton ----------- */
+.js .dropbutton-multiple.open .dropbutton-widget {
+ border-radius: 1em;
+}
.js .dropbutton-widget {
- background-color: white;
- border-radius: 5px;
+ position: relative !important;
+ border: 1px solid #e4e4e4;
+ border-bottom-color: #b4b4b4;
+ border-left-color: #d2d2d2;
+ border-right-color: #d2d2d2;
+ background-color: #fff;
+ background-image: -webkit-linear-gradient(top, #f3f3f3, #e8e8e8);
+ background-image: linear-gradient(to bottom, #f3f3f3, #e8e8e8);
+ color: #3a3a3a;
+ cursor: pointer;
+ text-align: center;
+ margin: 0.125em 0;
+ border-radius: 1em;
+}
+.js .dropbutton-widget:hover {
+ border-top-color: #e4e4e4;
+ border-bottom-color: #b4b4b4;
+ border-left-color: #d2d2d2;
+ border-right-color: #d2d2d2;
+}
+.js .dropbutton-widget .button {
+ border: none;
+ margin: 0;
+ padding: 0.32em 1em;
+ width: 100%;
+ border-radius: 1em;
+}
+.js .dropbutton-widget .button:hover {
+ border-radius: 1em 0 0 1em;
+}
+[dir="rtl"].js .dropbutton-widget .button:hover {
+ border-radius: 0 1em 1em 0;
+}
+.js .dropbutton-single .dropbutton-widget .dropbutton-action a {
+ color: #3a3a3a;
+}
+.js .dropbutton-single .dropbutton-widget .dropbutton-action a:hover {
+ background: #dedede;
+ border-radius: 1em;
+}
+.js .dropbutton-multiple .dropbutton-widget .dropbutton-action a {
+ color: #3a3a3a;
+ margin-right: 0;
+}
+[dir="rtl"].js .dropbutton-multiple .dropbutton-widget .dropbutton-action a {
+ margin-left: 0;
+}
+.js .dropbutton-multiple .dropbutton-widget .dropbutton-action a:hover {
+ background: #dedede;
+}
+.js .dropbutton-multiple .dropbutton-widget .dropbutton-action:first-child a:hover {
+ border-radius: 1em 0 0 1em; /* LTR */
+}
+[dir="rtl"].js .dropbutton-multiple .dropbutton-widget .dropbutton-action:first-child a:hover {
+ border-radius: 0 1em 1em 0;
+}
+.js .dropbutton-multiple.open .dropbutton-widget .dropbutton-action:first-child a:hover {
+ border-radius: 1em 0 0 0; /* LTR */
+}
+[dir="rtl"].js .dropbutton-multiple.open .dropbutton-widget .dropbutton-action:first-child a:hover {
+ border-radius: 0 1em 0 0;
+}
+.js .dropdown-widget .publish .button {
+ border-radius: 1em 0 0 1em; /* LTR */
+}
+[dir="rtl"].js .dropbutton-widget .publish .button {
+ border-radius: 0 1em 1em 0;
+}
+.js .dropbutton-multiple.open .dropbutton-action:first-child a,
+.js .dropbutton-multiple.open .dropbutton-action:first-child .button {
+ border-radius: 1em 0 0 0; /* LTR */
}
-.js .dropbutton-widget:hover,
-.js .dropbutton-widget:focus {
- background-color: #f8f8f8;
- border-color: #b8b8b8;
+[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:first-child a,
+[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:first-child .button {
+ border-radius: 0 1em 0 0;
}
-.js .dropbutton-multiple.open .dropbutton-widget:hover,
-.js .dropbutton-multiple.open .dropbutton-widget:focus {
- background-color: white;
+.js .dropbutton-multiple.open .dropbutton-action:last-child a,
+.js .dropbutton-multiple.open .dropbutton-action:last-child .button {
+ border-radius: 0 0 0 1em; /* LTR */
+}
+[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:last-child a,
+[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:last-child .button {
+ border-radius: 0 0 1em 0;
+}
+.js .dropbutton .secondary-action {
+ border-top-color: #ccc;
+}
+.js .dropbutton-toggle button {
+ border-radius: 0 1em 1em 0; /* LTR */
+ background-color: #e8e8e8;
+ background-image: -webkit-linear-gradient(top, #e8e8e8, #d2d2d2);
+ background-image: linear-gradient(to bottom, #e8e8e8, #d2d2d2);
+}
+[dir="rtl"].js .dropbutton-toggle button {
+ border-radius: 1em 0 0 1em;
+}
+.js .dropbutton-toggle .button:hover {
+ background: #ccc;
+}
+
+.js .dropbutton a {
+ border-bottom: none;
+}
+.js .dropbutton a:hover {
+ border-bottom-style: none;
}
/* ----------- media queries ------------------------------- */
diff --git a/core/themes/bartik/images/buttons.png b/core/themes/bartik/images/buttons.png
deleted file mode 100644
index c4b6df5..0000000
--- a/core/themes/bartik/images/buttons.png
+++ /dev/null
Binary files differ