Permalink
Browse files

added new fonts and stylus code

  • Loading branch information...
1 parent 1dbcaf0 commit 823bf0ed8a9fb981b4decdf870372d57ab55afed @jgnewman jgnewman committed Sep 5, 2012
Showing with 1,963 additions and 515 deletions.
  1. +0 −17 priv/admin/css/compiled/fonts.css
  2. +120 −85 priv/admin/css/compiled/general.css
  3. +0 −5 priv/admin/css/compiled/responsive.css
  4. +59 −0 priv/admin/css/compiled/reusable.css
  5. +90 −0 priv/admin/css/compiled/snapshot.css
  6. +261 −143 priv/admin/css/compiled/style.css
  7. +42 −16 priv/admin/css/fonts.styl
  8. +144 −167 priv/admin/css/general.styl
  9. +0 −10 priv/admin/css/responsive.styl
  10. +122 −0 priv/admin/css/reusable.styl
  11. +32 −0 priv/admin/css/snapshot.styl
  12. +1 −0 priv/admin/css/style.styl
  13. BIN priv/admin/fonts/noticiatext-italic-webfont.eot
  14. +243 −0 priv/admin/fonts/noticiatext-italic-webfont.svg
  15. BIN priv/admin/fonts/noticiatext-italic-webfont.ttf
  16. BIN priv/admin/fonts/noticiatext-italic-webfont.woff
  17. BIN priv/admin/fonts/noticiatext-regular-webfont.eot
  18. +243 −0 priv/admin/fonts/noticiatext-regular-webfont.svg
  19. BIN priv/admin/fonts/noticiatext-regular-webfont.ttf
  20. BIN priv/admin/fonts/noticiatext-regular-webfont.woff
  21. BIN priv/admin/fonts/titilliumtext25l002-webfont.eot
  22. +237 −0 priv/admin/fonts/titilliumtext25l002-webfont.svg
  23. BIN priv/admin/fonts/titilliumtext25l002-webfont.ttf
  24. BIN priv/admin/fonts/titilliumtext25l002-webfont.woff
  25. BIN priv/admin/fonts/titilliumtext25l005-webfont.eot
  26. +237 −0 priv/admin/fonts/titilliumtext25l005-webfont.svg
  27. BIN priv/admin/fonts/titilliumtext25l005-webfont.ttf
  28. BIN priv/admin/fonts/titilliumtext25l005-webfont.woff
  29. BIN priv/admin/images/gui-bg.jpg
  30. BIN priv/admin/images/riak-control-logo.png
  31. +2 −2 priv/admin/js/generated/templates.js
  32. +27 −5 priv/admin/js/legacy/gui.js
  33. +6 −0 priv/admin/js/router.js
  34. +33 −17 priv/admin/js/templates/application.hbs
  35. +63 −47 priv/admin/js/templates/snapshot.hbs
  36. +1 −1 templates/index.dtl
@@ -1,17 +0,0 @@
-/*
-@font-face styles
-*/
-@font-face {
- font-family: 'rokkitt';
- src: url("/admin/ui/fonts/rokkitt.eot");
- src: url("/admin/ui/fonts/rokkitt.eot?#iefix") format('embedded-opentype'), url("/admin/ui/fonts/rokkitt.woff") format('woff'), url("/admin/ui/fonts/rokkitt.ttf") format('truetype'), url("/admin/ui/fonts/rokkitt.svg#rokkitt") format('svg');
- font-weight: normal;
- font-style: normal;
-}
-@font-face {
- font-family: 'rokkitt';
- src: url("/admin/ui/fonts/rokkitt-bold.eot");
- src: url("/admin/ui/fonts/rokkitt-bold.eot?#iefix") format('embedded-opentype'), url("/admin/ui/fonts/rokkitt-bold.woff") format('woff'), url("/admin/ui/fonts/rokkitt-bold.ttf") format('truetype'), url("/admin/ui/fonts/rokkitt-bold.svg#rokkittbold") format('svg');
- font-weight: bold;
- font-style: normal;
-}
@@ -6,17 +6,30 @@ Styles to be applied generally across the UI
/* Functions */
/* End Functions */
/* Extensible Classes */
-.rokkitt,
+.headline-font,
+.headline-bold,
.gui-headline,
.gui-headline-bold,
.gui-headline-bold {
- font-family: 'rokkitt', arial, helvetica, sans-serif;
+ font-family: 'titillium', helvetica, arial, sans-serif;
}
-.sans,
+.copy-font,
+.copy-bold,
.gui-text,
.gui-text-bold,
+.gui-text-bold,
+.nav-li,
.nav-li {
- font-family: arial, helvetica, sans-serif;
+ font-family: 'noticia', georgia, serif;
+}
+.copy-bold,
+.gui-text-bold,
+.nav-li {
+ font-weight: bold;
+}
+.headline-bold,
+.gui-headline-bold {
+ font-weight: bold;
}
.gui-text,
.gui-text-bold,
@@ -25,10 +38,6 @@ Styles to be applied generally across the UI
color: #dfdfdf;
font-size: 14px;
}
-.gui-text-bold,
-.nav-li {
- font-weight: bold;
-}
.gui-headline,
.gui-headline-bold {
text-shadow: 0 2px 0 #000;
@@ -47,7 +56,7 @@ html {
background: url("/admin/ui/images/gui-bg.jpg") left top repeat #2d2d2d;
}
body {
- padding: 8px 0 0 0;
+ padding: 0;
}
a {
text-decoration: none;
@@ -62,101 +71,56 @@ h3 {
}
h1 {
font-size: 48px;
- letter-spacing: 2px;
+ letter-spacing: 1px;
padding-bottom: 5px;
}
h2 {
font-size: 38px;
- letter-spacing: 2px;
+ letter-spacing: 1px;
padding-bottom: 12px;
}
h3 {
font-size: 24px;
letter-spacing: 1px;
padding-bottom: 8px;
}
+nav {
+ background: transparent;
+ float: right;
+}
/* End Tags */
/* IDs & Classes */
#header {
width: auto;
- height: 67px;
- background: url("/admin/ui/images/header-bg.png") left top repeat-x transparent;
+ height: 53px;
+ border-bottom: 1px solid rgba(255,255,255,0.18);
+ background: #171717;
margin: 0 0 22px 0;
position: relative;
}
-#riak-control-logo {
- width: 201px;
- height: 56px;
- display: block;
- background: url("/admin/ui/images/riak-control-logo.gif") right bottom no-repeat transparent;
- float: left;
- padding: 5px 0 0 12px;
-}
-#basho-logo {
- width: 43px;
- height: 44px;
- position: absolute;
- right: 12px;
- top: 12px;
- display: block;
- background: url("/admin/ui/images/basho-logo.png") left top no-repeat transparent;
-}
-#wrapper {
+#navbar {
width: auto;
- height: auto;
- background: transparent;
- margin-bottom: 8px;
-}
-#split-bar {
- background: url("/admin/ui/images/resizer-bg.png") left top repeat transparent;
- width: 6px;
- height: 98%;
- position: absolute;
- right: 0;
- top: 0;
- opacity: 0.2;
- filter: alpha(opacity=20);
- -webkit-border-radius: 10px;
- -moz-border-radius: 10px;
- border-radius: 10px;
- border: 1px solid #fff;
-}
-nav {
- width: 218px;
- height: auto;
- overflow: hidden;
- background: transparent;
- float: left;
- position: relative;
+ height: 49px;
+ background: #383838;
+ background: -moz-linear-gradient(top, #606060 0%, #383838 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #606060), color-stop(100%, #383838));
+ background: -webkit-linear-gradient(top, #606060 0%, #383838 100%);
+ background: -o-linear-gradient(top, #606060 0%, #383838 100%);
+ background: -ms-linear-gradient(top, #606060 0%, #383838 100%);
+ background: linear-gradient(to bottom, #606060 0%, #383838 100%);
+ -webkit-box-shadow: inset 0 1px 2px rgba(255,255,255,0.18);
+ -moz-box-shadow: inset 0 1px 2px rgba(255,255,255,0.18);
+ box-shadow: inset 0 1px 2px rgba(255,255,255,0.18);
}
#nav-ul {
- width: 210px;
- height: auto;
-}
-#active-nav {
- position: absolute;
- left: 0;
- top: 0;
- width: 14px;
- height: 180px;
- background: url("/admin/ui/images/active-nav.png") left top no-repeat transparent;
-}
-.nav-li {
width: auto;
- height: 48px;
- background: url("/admin/ui/images/nav-icons.png") 12px 10px no-repeat transparent;
- padding: 0 0 0 14px;
+ height: 49px;
}
-.nav-li:hover {
- background-color: rgba(0,0,0,0.3);
-}
-.nav-li-disabled {
- width: auto;
- height: 48px;
- opacity: 0.3;
- filter: alpha(opacity=30);
- background: url("/admin/ui/images/nav-icons.png") 12px 10px no-repeat transparent;
- padding: 0 0 0 14px;
+.nav-li {
+ width: 63px;
+ height: 49px;
+ border-left: 1px solid #171717;
+ float: right;
}
#nav-snapshot {
background-position: 14px -344px;
@@ -183,17 +147,88 @@ nav {
background-position: 14px -300px;
}
.nav-item {
- width: auto;
- height: 33px;
+ width: 63px;
+ height: 49px;
+ background: #3a3a3a;
+ background: -moz-linear-gradient(top, #606060 0%, #3a3a3a 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #606060), color-stop(100%, #3a3a3a));
+ background: -webkit-linear-gradient(top, #606060 0%, #3a3a3a 100%);
+ background: -o-linear-gradient(top, #606060 0%, #3a3a3a 100%);
+ background: -ms-linear-gradient(top, #606060 0%, #3a3a3a 100%);
+ background: linear-gradient(to bottom, #606060 0%, #3a3a3a 100%);
+ -webkit-box-shadow: inset 0 1px 2px rgba(255,255,255,0.18);
+ -moz-box-shadow: inset 0 1px 2px rgba(255,255,255,0.18);
+ box-shadow: inset 0 1px 2px rgba(255,255,255,0.18);
display: block;
font-size: 18px;
vertical-align: middle;
- background: url("/admin/ui/images/cut-bg.png") left bottom repeat-x transparent;
- padding: 15px 0 0 40px;
+ position: relative;
+}
+.nav-item:hover {
+ background: #484848;
+ background: -moz-linear-gradient(top, #6b6b6b 0%, #484848 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #6b6b6b), color-stop(100%, #484848));
+ background: -webkit-linear-gradient(top, #6b6b6b 0%, #484848 100%);
+ background: -o-linear-gradient(top, #6b6b6b 0%, #484848 100%);
+ background: -ms-linear-gradient(top, #6b6b6b 0%, #484848 100%);
+ background: linear-gradient(to bottom, #6b6b6b 0%, #484848 100%);
+}
+.nav-item .indicator {
+ width: 63px;
+ height: 4px;
+ -webkit-box-shadow: inset 0 1px 2px rgba(255,255,255,0.4);
+ -moz-box-shadow: inset 0 1px 2px rgba(255,255,255,0.4);
+ box-shadow: inset 0 1px 2px rgba(255,255,255,0.4);
+ display: block;
+ background: #767676;
+ border-top: 1px solid #171717;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+}
+.nav-li.active a {
+ background: #363636;
+ -webkit-box-shadow: inset 0 0 18px rgba(0,0,0,0.7);
+ -moz-box-shadow: inset 0 0 18px rgba(0,0,0,0.7);
+ box-shadow: inset 0 0 18px rgba(0,0,0,0.7);
+}
+.nav-li.active span {
+ -webkit-box-shadow: 0 0 20px #f99d33;
+ -moz-box-shadow: 0 0 20px #f99d33;
+ box-shadow: 0 0 20px #f99d33;
+ background: #f99d33;
+ background: -moz-linear-gradient(top, #fbbd76 0%, #f99d33 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fbbd76), color-stop(100%, #f99d33));
+ background: -webkit-linear-gradient(top, #fbbd76 0%, #f99d33 100%);
+ background: -o-linear-gradient(top, #fbbd76 0%, #f99d33 100%);
+ background: -ms-linear-gradient(top, #fbbd76 0%, #f99d33 100%);
+ background: linear-gradient(to bottom, #fbbd76 0%, #f99d33 100%);
}
.nav-li .nav-item:hover {
cursor: pointer;
}
+#riak-control-logo {
+ width: 224px;
+ height: 42px;
+ display: block;
+ background: url("/admin/ui/images/riak-control-logo.png") right bottom no-repeat transparent;
+ float: left;
+}
+#basho-logo {
+ width: 43px;
+ height: 44px;
+ position: absolute;
+ right: 12px;
+ top: 12px;
+ display: block;
+ background: url("/admin/ui/images/basho-logo.png") left top no-repeat transparent;
+}
+#wrapper {
+ width: auto;
+ height: auto;
+ background: transparent;
+ margin-bottom: 8px;
+}
#content-well {
overflow: hidden;
background: transparent;
@@ -1,8 +1,3 @@
/*
Handle cases to add responsiveness
*/
-@media screen and (max-width: 768px) {
- .nav-text {
- display: none;
- }
-}
@@ -0,0 +1,59 @@
+/* Variables */
+/* End Variables */
+/* Functions */
+/* End Functions */
+/* Extensible Classes */
+.headline-font,
+.headline-bold,
+.gui-headline,
+.gui-headline-bold,
+.gui-headline-bold {
+ font-family: 'titillium', helvetica, arial, sans-serif;
+}
+.copy-font,
+.copy-bold,
+.gui-text,
+.gui-text-bold,
+.gui-text-bold {
+ font-family: 'noticia', georgia, serif;
+}
+.monospace {
+ font-family: 'menlo', 'consolas', 'monaco', monospace;
+}
+.copy-bold,
+.gui-text-bold {
+ font-weight: bold;
+}
+.headline-bold,
+.gui-headline-bold {
+ font-weight: bold;
+}
+.gui-text,
+.gui-text-bold {
+ text-shadow: 0 2px 0 #000;
+ color: #ccc;
+ font-size: 14px;
+}
+.gui-text-bold {
+ color: #efefef;
+}
+.gui-headline,
+.gui-headline-bold {
+ text-shadow: 0 2px 0 #000;
+ color: #ccc;
+ text-shadow: 0 2px 0 #000;
+}
+.gui-headline-bold {
+ color: #efefef;
+ font-weight: bold;
+}
+.has-cut {
+ background: url("/admin/ui/images/cut-bg.png") left bottom repeat-x transparent;
+}
+.bulleted {
+ list-style-type: disc;
+}
+.clear {
+ clear: both;
+}
+/* End Extensible Classes */
Oops, something went wrong.

0 comments on commit 823bf0e

Please sign in to comment.