Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[t1442] dialog css changes

1. Unified button style.
2. Fonts replaced with Open Sans.
  • Loading branch information...
commit 86ee5086a16835b1d1bff43852df09c98fdaf662 1 parent 4355222
@secretrobotron secretrobotron authored jbuck committed
View
4 dialogs/delete-track.html
@@ -36,8 +36,8 @@
</div>
</div>
<div id="buttons" class="vbox center">
- <button id="yes">Yes</button>
- <button id="no">No</button>
+ <button class="butter-dialog-button" id="yes">Yes</button>
+ <button class="butter-dialog-button" id="no">No</button>
</div>
<div id="close-button"></div>
</body>
View
153 dialogs/dialog.css
@@ -20,21 +20,27 @@ html, body {
}
@font-face {
- font-family: 'BebasRegular';
- src: url('../src/ui/assets/fonts/BEBAS___-webfont.eot');
- src: url('../src/ui/assets/fonts/BEBAS___-webfont.eot?#iefix') format('embedded-opentype'),
- url('../src/ui/assets/fonts/BEBAS___-webfont.woff') format('woff'),
- url('../src/ui/assets/fonts/BEBAS___-webfont.ttf') format('truetype'),
- url('../src/ui/assets/fonts/BEBAS___-webfont.svg#BebasRegular') format('svg');
- font-weight: normal;
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 400;
+ src: local('Open Sans Italic'), local('Open-Sans-Italic'),
+ url('../resources/fonts/OpenSans-Italic.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'Open Sans';
font-style: normal;
+ font-weight: 700;
+ src: local('Open Sans Bold'), local('Open-Sans-Bold'),
+ url('../resources/fonts/OpenSans-Bold.ttf') format('truetype');
}
-/* MetaWebPro font family licensed from fontshop.com. WOFF-FTW! */
+
@font-face {
- font-family: 'MetaBold';
- src: url('http://www.mozilla.org/img/fonts/MetaWebPro-Bold.eot');
- src: local(''), url('http://www.mozilla.org/img/fonts/MetaWebPro-Bold.woff') format('woff');
- font-weight: bold;
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Open Sans Regular'), local('Open-Sans-Regular'),
+ url('../resources/fonts/OpenSans-Regular.ttf') format('truetype');
}
.hbox {
@@ -81,7 +87,7 @@ html, body {
height: 20px;
text-align: center;
color: #900;
- font: 20px Verdana;
+ font: 20px 'Open Sans';
z-index: 0;
}
@@ -128,47 +134,84 @@ body[data-error] #container {
text-align: center;
}
-.button-red {
- background: #c22f02; /* Old browsers */
- background: -moz-linear-gradient(top, #c22f02 0%, #c42f02 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#c22f02), color-stop(100%,#c42f02)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #c22f02 0%,#c42f02 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #c22f02 0%,#c42f02 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #c22f02 0%,#c42f02 100%); /* IE10+ */
- background: linear-gradient(top, #c22f02 0%,#c42f02 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c22f02', endColorstr='#c42f02',GradientType=0 ); /* IE6-9 */
-}
-
-.button-red:hover {
- background: #e23602; /* Old browsers */
- background: -moz-linear-gradient(top, #e23602 0%, #e43702 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e23602), color-stop(100%,#e43702)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #e23602 0%,#e43702 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #e23602 0%,#e43702 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #e23602 0%,#e43702 100%); /* IE10+ */
- background: linear-gradient(top, #e23602 0%,#e43702 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e23602', endColorstr='#e43702',GradientType=0 ); /* IE6-9 */
-}
-
-.button-blue {
- background: #D1BE70;
- background: -moz-linear-gradient(top, #26B5D8 0%, #2B86D4 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#26B5D8), color-stop(100%,#2B86D4));
- background: -webkit-linear-gradient(top, #26B5D8 0%,#2B86D4 100%);
- background: -o-linear-gradient(top, #26B5D8 0%,#2B86D4 100%);
- background: -ms-linear-gradient(top, #26B5D8 0%,#2B86D4 100%);
- background: linear-gradient(top, #2B86D4);
- box-shadow: none;
+.butter-dialog-button {
+ display: inline-block;
+ padding: 4px 10px 4px;
+ margin-bottom: 0;
+ font-size: 13px;
+ line-height: 18px;
+ color: #333333;
+ text-align: center;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ vertical-align: middle;
+ cursor: pointer;
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(top, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+ border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ border: 1px solid #cccccc;
+ border-bottom-color: #b3b3b3;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
}
-
-.button-blue:hover {
- background: #D1BE70;
- background: -moz-linear-gradient(top, #26B5D8 0%, #29B4D6 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#D1BE70), color-stop(100%,#29B4D6));
- background: -webkit-linear-gradient(top, #26B5D8 0%,#29B4D6 100%);
- background: -o-linear-gradient(top, #26B5D8 0%,#29B4D6 100%);
- background: -ms-linear-gradient(top, #26B5D8 0%,#29B4D6 100%);
- background: linear-gradient(top, #26B5D8 0%,#29B4D6 100%);
+.butter-dialog-button:hover,
+.butter-dialog-button:active,
+.butter-dialog-button.active,
+.butter-dialog-button.disabled,
+.butter-dialog-button[disabled] {
+ background-color: #e6e6e6;
+}
+.butter-dialog-button:active,
+.butter-dialog-button.active {
+ background-color: #cccccc;
+}
+.butter-dialog-button:hover {
+ color: #333333;
+ text-decoration: none;
+ background-color: #e6e6e6;
+ background-position: 0 -15px;
+ -webkit-transition: background-position 0.1s linear;
+ -moz-transition: background-position 0.1s linear;
+ -ms-transition: background-position 0.1s linear;
+ -o-transition: background-position 0.1s linear;
+ transition: background-position 0.1s linear;
+}
+.butter-dialog-button:focus {
+ outline: thin dotted #333;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+.butter-dialog-button.active,
+.butter-dialog-button:active {
+ background-color: #e6e6e6;
+ background-color: #d9d9d9;
+ background-image: none;
+ outline: 0;
+ -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.butter-dialog-button.disabled,
+.butter-dialog-button[disabled] {
+ cursor: default;
+ background-color: #e6e6e6;
+ background-image: none;
+ opacity: 0.65;
+ filter: alpha(opacity=65);
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
.main-textarea {
@@ -183,7 +226,7 @@ body[data-error] #container {
}
h1 {
- font: 35px 'MetaBold';
+ font: 35px 'Open Sans';
color: #fff;
line-height: 40px;
height: 40px;
@@ -209,7 +252,7 @@ button {
border: none;
cursor: pointer;
color: white;
- font-family: Verdana, sans-serif;
+ font-family: 'Open Sans';
font-size: 18px;
min-width: 100px;
}
View
4 dialogs/quit-confirmation.html
@@ -23,8 +23,8 @@
</div>
</div>
<div id="buttons" class="hbox center">
- <button class="button-blue" id="yes">Yes</button>
- <button class="button-red" id="no">No</button>
+ <button class="butter-dialog-button" id="yes">Yes</button>
+ <button class="butter-dialog-button" id="no">No</button>
</div>
</body>
</html>
View
2  dialogs/save-as.html
@@ -51,7 +51,7 @@
</div>
</div>
<div id="buttons" class="hbox center">
- <button class="button-blue" disabled id="save">Save</button>
+ <button class="butter-dialog-button" disabled id="save">Save</button>
</div>
<div id="close-button"></div>
</body>
View
2  dialogs/track-data.html
@@ -53,7 +53,7 @@
</div>
<div id="error"></div>
<div id="buttons" class="vbox center">
- <button class="button-blue" id="update">Update</button>
+ <button class="butter-dialog-button" id="update">Update</button>
</div>
<div id="close-button"></div>
</body>
View
4 dialogs/view-source.html
@@ -23,8 +23,8 @@
</div>
</div>
<div id="buttons" class="vbox center">
- <button class="button-blue" disabled id="json-button">Get JSON</button>
- <button class="button-blue" disabled id="html-button">Get HTML</button>
+ <button class="butter-dialog-button" disabled id="json-button">Get JSON</button>
+ <button class="butter-dialog-button" disabled id="html-button">Get HTML</button>
</div>
<div id="close-button"></div>
</body>
Please sign in to comment.
Something went wrong with that request. Please try again.