Skip to content

Commit

Permalink
Merge pull request #52 from joewashear007/DevBranch
Browse files Browse the repository at this point in the history 
Finished restyling UI
Close #47
Started on #12
  • Loading branch information
@joewashear007
joewashear007 committed Feb 27, 2014
2 parents 1018d5d + 2afd543 commit 1d332bb
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 76 deletions.
62 changes: 31 additions & 31 deletions web/css/BlenderController.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ button,
.ui-btn {
font-size: 1em;
line-height: 1.3;
font-family: sans-serif /*{global-font-family}*/;
font-family: sans-serif /*{global-font-family}*/;
}
legend,
.ui-input-text input,
Expand Down Expand Up @@ -124,14 +124,14 @@ label.ui-btn {
/* Shadow
-----------------------------------------------------------------------------------------------------------*/
.ui-shadow {
-webkit-box-shadow: 0 1px 5px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
-moz-box-shadow: 0 1px 5px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
box-shadow: 0 1px 5px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
-webkit-box-shadow: 0 1px 2px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
-moz-box-shadow: 0 1px 2px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
box-shadow: 0 1px 2px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
}
.ui-shadow-inset {
-webkit-box-shadow: inset 0 1px 5px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
-moz-box-shadow: inset 0 1px 5px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
box-shadow: inset 0 1px 5px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
-webkit-box-shadow: inset 0 1px 2px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
-moz-box-shadow: inset 0 1px 2px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
box-shadow: inset 0 1px 2px /*{global-box-shadow-size}*/ rgba(255,255,255,0.5) /*{global-box-shadow-color}*/;
}
.ui-overlay-shadow {
-webkit-box-shadow: 0 0 12px rgba(0,0,0,.6);
Expand Down Expand Up @@ -220,10 +220,10 @@ html .ui-alt-icon .ui-radio-off:after {
html .ui-bar-a .ui-bar-inherit,
html .ui-body-a .ui-bar-inherit,
html body .ui-group-theme-a .ui-bar-inherit {
background: #e28755 /*{a-bar-background-color}*/;
background: #CDBFAC /*{a-bar-background-color}*/;
border-color: #f95806 /*{a-bar-border}*/;
color: #9e2200 /*{a-bar-color}*/;
text-shadow: 1px /*{a-bar-shadow-x}*/ 1px /*{a-bar-shadow-y}*/ 1px /*{a-bar-shadow-radius}*/ #ffd8b3 /*{a-bar-shadow-color}*/;
color: #FF6600 /*{a-bar-color}*/;
text-shadow: 0px /*{a-bar-shadow-x}*/ 0px /*{a-bar-shadow-y}*/ 5px /*{a-bar-shadow-radius}*/ #F5EDE3 /*{a-bar-shadow-color}*/;
font-weight: bold;
}
.ui-bar-a {
Expand All @@ -234,8 +234,8 @@ html body .ui-group-theme-a .ui-bar-inherit {
.ui-overlay-a,
.ui-page-theme-a,
.ui-page-theme-a .ui-panel-wrapper {
background: #ffffff /*{a-page-background-color}*/;
border-color: #bbbbbb /*{a-page-border}*/;
background: #F5EDE3 /*{a-page-background-color}*/;
border-color: #ff6600 /*{a-page-border}*/;
color: #333333 /*{a-page-color}*/;
text-shadow: 0 /*{a-page-shadow-x}*/ 0 /*{a-page-shadow-y}*/ 0 /*{a-page-shadow-radius}*/ #000000 /*{a-page-shadow-color}*/;
}
Expand All @@ -247,7 +247,7 @@ html .ui-body-a .ui-body-inherit,
html body .ui-group-theme-a .ui-body-inherit,
html .ui-panel-page-container-a {
background: #ffffff /*{a-body-background-color}*/;
border-color: #949494 /*{a-body-border}*/;
border-color: #154890 /*{a-body-border}*/;
color: #333333 /*{a-body-color}*/;
text-shadow: 0 /*{a-body-shadow-x}*/ 2px /*{a-body-shadow-y}*/ 0 /*{a-body-shadow-radius}*/ #f3f3f3 /*{a-body-shadow-color}*/;
}
Expand All @@ -260,7 +260,7 @@ html .ui-panel-page-container-a {
html .ui-bar-a a,
html .ui-body-a a,
html body .ui-group-theme-a a {
color: #3388cc /*{a-link-color}*/;
color: #6699ff /*{a-link-color}*/;
font-weight: bold;
}
.ui-page-theme-a a:visited,
Expand Down Expand Up @@ -293,8 +293,8 @@ html .ui-bar-a .ui-btn:visited,
html .ui-body-a .ui-btn:visited,
html body .ui-group-theme-a .ui-btn:visited,
html head + body .ui-btn.ui-btn-a:visited {
background: #f6f6f6 /*{a-bup-background-color}*/;
border-color: #f95806 /*{a-bup-border}*/;
background: #E1D4C0 /*{a-bup-background-color}*/;
border-color: #154890 /*{a-bup-border}*/;
color: #333333 /*{a-bup-color}*/;
text-shadow: 0 /*{a-bup-shadow-x}*/ 2px /*{a-bup-shadow-y}*/ 0 /*{a-bup-shadow-radius}*/ #f3f3f3 /*{a-bup-shadow-color}*/;
}
Expand All @@ -304,8 +304,8 @@ html .ui-bar-a .ui-btn:hover,
html .ui-body-a .ui-btn:hover,
html body .ui-group-theme-a .ui-btn:hover,
html head + body .ui-btn.ui-btn-a:hover {
background: #ededed /*{a-bhover-background-color}*/;
border-color: #f95806 /*{a-bhover-border}*/;
background: #CDBFAC /*{a-bhover-background-color}*/;
border-color: #154890 /*{a-bhover-border}*/;
color: #333333 /*{a-bhover-color}*/;
text-shadow: 0 /*{a-bhover-shadow-x}*/ 2px /*{a-bhover-shadow-y}*/ 0 /*{a-bhover-shadow-radius}*/ #f3f3f3 /*{a-bhover-shadow-color}*/;
}
Expand All @@ -315,8 +315,8 @@ html .ui-bar-a .ui-btn:active,
html .ui-body-a .ui-btn:active,
html body .ui-group-theme-a .ui-btn:active,
html head + body .ui-btn.ui-btn-a:active {
background: #e28755 /*{a-bdown-background-color}*/;
border-color: #dddddd /*{a-bdown-border}*/;
background: #6699FF /*{a-bdown-background-color}*/;
border-color: #154890 /*{a-bdown-border}*/;
color: #333333 /*{a-bdown-color}*/;
text-shadow: 0 /*{a-bdown-shadow-x}*/ 2px /*{a-bdown-shadow-y}*/ 0 /*{a-bdown-shadow-radius}*/ #f3f3f3 /*{a-bdown-shadow-color}*/;
}
Expand Down Expand Up @@ -344,18 +344,18 @@ html .ui-bar-a .ui-slider-track .ui-btn-active,
html .ui-body-a .ui-slider-track .ui-btn-active,
html body .ui-group-theme-a .ui-slider-track .ui-btn-active,
html body div.ui-slider-track.ui-body-a .ui-btn-active {
background-color: #e28755 /*{a-active-background-color}*/;
border-color: #f95806 /*{a-active-border}*/;
background-color: #6699FF /*{a-active-background-color}*/;
border-color: #154890 /*{a-active-border}*/;
color: #ffffff /*{a-active-color}*/;
text-shadow: 1px /*{a-active-shadow-x}*/ 1px /*{a-active-shadow-y}*/ 1px /*{a-active-shadow-radius}*/ #ffd8b3 /*{a-active-shadow-color}*/;
text-shadow: 1px /*{a-active-shadow-x}*/ 1px /*{a-active-shadow-y}*/ 1px /*{a-active-shadow-radius}*/ #333333 /*{a-active-shadow-color}*/;
}
/* Active radio button icon */
.ui-page-theme-a .ui-radio-on:after,
html .ui-bar-a .ui-radio-on:after,
html .ui-body-a .ui-radio-on:after,
html body .ui-group-theme-a .ui-radio-on:after,
.ui-btn.ui-radio-on.ui-btn-a:after {
border-color: #e28755 /*{a-active-background-color}*/;
border-color: #6699FF /*{a-active-background-color}*/;
}
/* Focus */
.ui-page-theme-a .ui-btn:focus,
Expand All @@ -370,9 +370,9 @@ html .ui-body-a .ui-focus,
html body .ui-group-theme-a .ui-focus,
html head + body .ui-btn-a.ui-focus,
html head + body .ui-body-a.ui-focus {
-webkit-box-shadow: 0 0 12px #e28755 /*{a-active-background-color}*/;
-moz-box-shadow: 0 0 12px #e28755 /*{a-active-background-color}*/;
box-shadow: 0 0 12px #e28755 /*{a-active-background-color}*/;
-webkit-box-shadow: 0 0 12px #6699FF /*{a-active-background-color}*/;
-moz-box-shadow: 0 0 12px #6699FF /*{a-active-background-color}*/;
box-shadow: 0 0 12px #6699FF /*{a-active-background-color}*/;
}
/* B
-----------------------------------------------------------------------------------------------------------*/
Expand All @@ -382,10 +382,10 @@ html head + body .ui-body-a.ui-focus {
html .ui-bar-b .ui-bar-inherit,
html .ui-body-b .ui-bar-inherit,
html body .ui-group-theme-b .ui-bar-inherit {
background: #ec798e /*{b-bar-background-color}*/;
border-color: #c41219 /*{b-bar-border}*/;
color: #c41219 /*{b-bar-color}*/;
text-shadow: 1px /*{b-bar-shadow-x}*/ 1px /*{b-bar-shadow-y}*/ 1px /*{b-bar-shadow-radius}*/ #fabdbd /*{b-bar-shadow-color}*/;
background: #E47297 /*{b-bar-background-color}*/;
border-color: #AA0114 /*{b-bar-border}*/;
color: #AA0114 /*{b-bar-color}*/;
text-shadow: 0px /*{b-bar-shadow-x}*/ 0px /*{b-bar-shadow-y}*/ 5px /*{b-bar-shadow-radius}*/ #fFE9E8 /*{b-bar-shadow-color}*/;
font-weight: bold;
}
.ui-bar-b {
Expand Down
Loading

0 comments on commit 1d332bb

Please sign in to comment.