Permalink
Browse files

merged CSS updates from brace

  • Loading branch information...
2 parents cddb520 + b69719a commit b392c8552962181679805ef34163d41b87c28d50 @jlong jlong committed Mar 23, 2011
Showing with 570 additions and 437 deletions.
  1. BIN public/images/admin/add_child.png
  2. BIN public/images/admin/buttons_background.png
  3. BIN public/images/admin/menu_highlight.png
  4. BIN public/images/admin/navigation_background.gif
  5. BIN public/images/admin/navigation_secondary_background.png
  6. BIN public/images/admin/navigation_secondary_separator.gif
  7. BIN public/images/admin/navigation_shadow.png
  8. BIN public/images/admin/navigation_tabs.png
  9. BIN public/images/admin/new_layout.png
  10. BIN public/images/admin/new_snippet.png
  11. BIN public/images/admin/new_user.png
  12. BIN public/images/admin/row_highlight.png
  13. BIN public/images/admin/search.png
  14. BIN public/images/admin/shadow.png
  15. BIN public/images/admin/spacer.gif
  16. BIN public/images/admin/vertical_tan_gradient.png
  17. BIN public/images/admin/view_site.png
  18. +9 −7 stylesheets/admin/partials/_actions.sass
  19. +1 −1 stylesheets/admin/partials/_dropdown.sass
  20. +30 −7 stylesheets/admin/partials/_forms.sass
  21. +81 −75 stylesheets/admin/partials/_header.sass
  22. +6 −2 stylesheets/admin/partials/_index.sass
  23. +44 −6 stylesheets/admin/partials/_popup.sass
  24. +3 −2 stylesheets/admin/partials/_tabcontrol.sass
  25. +13 −13 views/admin/_layout.haml
  26. +3 −3 views/admin/javascripts/index.haml
  27. +0 −18 views/admin/javascripts/remove.haml
  28. +1 −0 views/admin/javascripts/remove/_layout.haml
  29. +21 −0 views/admin/javascripts/remove/index.haml
  30. +3 −9 views/admin/layouts/index.haml
  31. +0 −5 views/admin/layouts/index_after_layout_removed.haml
  32. +0 −18 views/admin/layouts/remove.haml
  33. +1 −0 views/admin/layouts/remove/_layout.haml
  34. +21 −0 views/admin/layouts/remove/index.haml
  35. +226 −172 views/admin/pages/index.haml
  36. +0 −39 views/admin/pages/remove.haml
  37. +1 −0 views/admin/pages/remove/_layout.haml
  38. +42 −0 views/admin/pages/remove/index.haml
  39. +3 −6 views/admin/snippets/index.haml
  40. +0 −18 views/admin/snippets/remove.haml
  41. +1 −0 views/admin/snippets/remove/_layout.haml
  42. +21 −0 views/admin/snippets/remove/index.haml
  43. +3 −3 views/admin/stylesheets/index.haml
  44. +0 −18 views/admin/stylesheets/remove.haml
  45. +1 −0 views/admin/stylesheets/remove/_layout.haml
  46. +21 −0 views/admin/stylesheets/remove/index.haml
  47. +14 −15 views/view_helpers.rb
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
@@ -9,14 +9,15 @@
right: 0
bottom: 0
background: #777
- +linear-gradient(color_stops(#555, #666, #777, #777))
+ +linear-gradient(color-stops(#555, #666, #777, #777))
ul
padding: 14px 8px
li
display: inline
margin-right: 5px
a
- background: #eee image_url('admin/buttons_background.png') repeat-x
+ background: #d8d8d8
+ +linear-gradient(color-stops(#fff, #ccc))
color: #333
font-size: 80%
padding: 8px 12px
@@ -45,7 +46,8 @@
float: left
padding: 6px 12px 6px 12px
margin-right: 1px
- background: #fff image_url('admin/shadow.png') repeat-x
+ background: #ddd
+ +linear-gradient(color-stops(#c5c5c5, #f0f0f0 20%, #fff 35%, #fff))
color: #999
font-size: 80%
text-decoration: none
@@ -54,20 +56,20 @@
a
text-shadow: 1px 1px 1px #eee
&:hover
- background: #fff image_url('admin/buttons_background.png') repeat-x
+ background: #d8d8d8
+ +linear-gradient(color-stops(#fff, #fff, #ddd))
color: #0076a3
+button-shadow
&:active
- background: #fff image_url('admin/shadow.png') repeat-x
color: #000
+no-button-shadow
span.disabled
color: #666
background-color: #999
- background-image: none
- +linear-gradient(color_stops(#888, #999, #999, #999))
+ +linear-gradient(color-stops(#888, #999, #999, #999))
span.current
color: #000
+ background: white
font-weight: bold
background-image: none
+button-shadow
@@ -23,6 +23,6 @@ ul.menu
text-decoration: none
border-top: 1px solid white
&:hover
- background: #e0f0ff image_url('admin/menu_highlight.png') top center repeat-x
+ background: #e0f0ff
border-top: 1px solid #d5f0ff
+linear-gradient(color_stops(#e5f5ff, #b5d0f5))
@@ -77,12 +77,19 @@
margin-top: -1em
margin-bottom: 1em
.drawer_contents
- background: #7e7e7e image_url('admin/navigation_shadow.png') repeat-x
+ background: #7e7e7e
+border-bottom-right-radius(6px)
margin: 0
margin-right: 2px
padding-bottom: 2px
overflow: hidden
+ &:before
+ content: "\0020"
+ display: block
+ width: 100%
+ +linear-gradient(color-stops(rgba(black,0.3), rgba(black, 0)))
+ height: 3px
+ margin-bottom: -3px
table.fieldset
margin: 0
padding: 0
@@ -138,13 +145,26 @@
.box
color: #333
- background: #f5f1e2 image_url('admin/vertical_tan_gradient.png') top left repeat-x
+ background: #f5f1e2
font-size: 90%
padding: 1px 15px 10px
+ position: relative
margin: 3px 0 20px
- height: 1%
- overflow-y: auto
+border-radius(8px)
+ +pie-clearfix
+ *
+ position: relative
+ &:before
+ +linear-gradient(color-stops(white, #f5f1e2 50%, #f5f1e2))
+ +border-top-radius(10px)
+ content: "\0020"
+ display: block
+ position: absolute
+ width: 100%
+ height: 100px
+ overflow: hidden
+ left: 0
+ top: 0
h3
color: #333
margin: 15px 0 0
@@ -181,6 +201,7 @@
img.avatar
float: right
margin: 10px 0px
+ z-index: 100
textarea
border: 1px solid #cdc295
@@ -209,10 +230,11 @@ body.reversed
color: #d0d0d0
text-shadow: none
.buttons
- background: white image_url('admin/buttons_background.png') bottom repeat-x
- padding: 12px 10px
+ background: #d8d8d8
+ +linear-gradient(color-stops(#fff, #ccc))
+border-radius(8px)
+box-shadow(rgba(0,0,0,0.15), 2px, 2px, 3px)
+ padding: 12px 10px
fieldset
background: #858585
padding: 20px 15px
@@ -238,7 +260,8 @@ body.reversed
body.single_form
#content
#single_form
- background: #f5f1e2 image_url('admin/vertical_tan_gradient.png') center -15px repeat-x
+ background: #f5f1e2
+ +linear-gradient(color-stops(#fdfcf9, #f5f1e2 25%, #f5f1e2))
border: 0.35em solid #efead3
padding: 0.5em 1.5em
padding-right: 22px
@@ -1,48 +1,52 @@
+$header: #ca0000
+$primary-tab: rgba(white, 0.3)
+$primary-tab-current: white
+
#header
font-size: 90%
- background: #c00 image_url('admin/navigation_background.gif') repeat-x
- width: 100%
+ background: $header
+ +linear-gradient(color-stops(darken($header,12), $header, $header))
position: relative
- height: auto
-
+ &:after
+ content: "\0020"
+ display: block
+ clear: both
+ overflow: hidden
+ height: 2px
+ width: 100%
+ position: absolute
+ +linear-gradient(color-stops(rgba(black,0.3), rgba(black, 0)))
+
#site_links
- color: #f5cbcb
+ color: mix($header, white, 15%)
font-size: 80%
float: right
- padding: 15px 80px 0 5px
+ padding: 15px 10px 0 5px
height: 16px
- a, a:visited
+ a
color: white
a:hover, strong a
text-decoration: none
-
+
#view_site
font-size: 90%
- background: image_url('admin/view_site.png') no-repeat
- display: block
- position: absolute
- right: 12px
- top: 14px
- height: 17px
- width: 64px
- line-height: 17px
- padding-left: 1px
- text-align: center
+ background: rgba(black, 0.45)
+ +border-radius
+ display: inline
+ padding: 3px 10px 4px
text-decoration: none
ul#navigation
- font-size: 100%
float: left
margin-top: 6px
- postion: relative
li
float: left
height: 30px
margin: 4px 0 0 8px
white-space: nowrap
- a
- background: image_url('admin/navigation_tabs.png') left top repeat-x
- color: #edd
+ a
+ background: $primary-tab
+ color: mix($header, white, 15%)
display: block
height: 30px
line-height: 30px
@@ -51,62 +55,64 @@ ul#navigation
text-decoration: none
+border-top-radius(6px)
&:hover a
- background-position: left -48px
+ background: opacify($primary-tab, 0.2)
color: white
&.current a
- background-position: left -96px
+ background: white
color: #333
font-weight: bold
- &.dimmed a
- background-position: 0 -48px
- ul#nav_sub
- background: image_url('admin/navigation_secondary_background.png') repeat-x
- font-size: 95%
- clear: both
- left: 0
- bottom: 0
- margin: 0
- padding: 0
- position: absolute
- width: 100%
- height: 38px
- z-index: 10
- li
- margin: 0
- a
- background: image_url('admin/navigation_secondary_background.png') repeat-x
- color: #555
- display: -moz-inline-stack
- display: inline-block
- font-weight: normal
- line-height: 38px
- margin: 0
- padding: 0
- height: 38px
- &:hover
- background-position: left -40px
- color: #444
- &.current
- background: image_url('admin/navigation_secondary_background.png') left -80px repeat-x
- color: #333
- font-weight: bold
- &:hover
- background-position: left -120px
- color: #222
- span
- background: image_url('admin/navigation_secondary_separator.gif') right bottom no-repeat
- display: block
- margin: 0
- padding: 0 26px
- height: 38px
-#header_bottom
+#toolbar
+ background: white
+ +linear-gradient(color-stops(white, darken(white, 5%), darken(white, 20%)))
+ font-size: 95%
clear: both
+ margin: 0
+ width: 100%
height: 38px
- position: relative
- div
- background: image_url('admin/navigation_shadow.png') repeat-x
- position: absolute
- top: 38px
- width: 100%
- height: 4px
+ +pie-clearfix
+ .right
+ float: right
+ form.search
+ padding: 8px 8px 0
+ input[type=search]
+ font-size: 12px
+ +border-radius(100px)
+ border: 1px solid #ccc
+ border-top-color: #999
+ border-left-color: #b0b0b0
+ border-right-color: #bbb
+ background: white image_url('admin/search.png') 4px center no-repeat
+ +box-shadow(rgba(black, 0.2), 0, 1px, 0, inset)
+ width: 180px
+ padding: 2px 8px 2px 20px
+
+ul#secondary_navigation
+ float: left
+ margin-right: 8px
+ li
+ float: left
+ display: block
+ background: image-url('admin/navigation_secondary_separator.gif') bottom right no-repeat
+ padding-right: 2px
+ a
+ color: #555
+ display: block
+ font-weight: normal
+ float: left
+ line-height: 38px
+ margin: 0
+ padding: 0 26px
+ height: 38px
+ text-decoration: none
+ &:hover
+ +linear-gradient(color-stops(#e4f9ff, #d2ebfd 30%, #b1d1f1 50%, #9bc5ed 50%, #caecff))
+ color: #444
+ &.current
+ background: #ddd
+ +linear-gradient(color-stops(white, darken(white, 10%) 35%, darken(white, 15%) 50%, darken(white, 20%) 50%, darken(white, 15%)))
+ color: #333
+ font-weight: bold
+ &:hover
+ +linear-gradient(color-stops(#e0f9fe, #c4e2f8 30%, #98c3e7 50%, #79aedb 50%, #b1ddef))
+ color: #222
@@ -39,7 +39,8 @@ table.index
color: black
text-decoration: none
&:hover
- background: #eee image_url('admin/buttons_background.png') repeat-x
+ background: #d8d8d8
+ +linear-gradient(color-stops(#fff, #ccc))
border: 1px solid #a5c9df
margin: 0 24px 0 0
+border-radius
@@ -79,8 +80,11 @@ table.index
td
border-top: 1px solid #d5f0ff
border-bottom: 1px solid #c5dff5
- background: #c5dff5 image_url('admin/row_highlight.png') repeat-x center top
+ background: #c5dff5
+linear-gradient(color_stops(#e5f5ff, #c5dff5))
+ thead
+ tr, tr:first-child
+ border-top: none
table.index#pages
tr.page
Oops, something went wrong.

0 comments on commit b392c85

Please sign in to comment.