Skip to content

Commit

Permalink
Big sass refactoring/syncing with bookyt.
Browse files Browse the repository at this point in the history
  • Loading branch information
huerlisi committed Oct 20, 2010
1 parent fd73844 commit 292772c
Show file tree
Hide file tree
Showing 25 changed files with 121 additions and 271 deletions.
4 changes: 4 additions & 0 deletions app/stylesheets/partials/_content.sass
Expand Up @@ -5,6 +5,10 @@
@import 'partials/content/flash_errors'
@import 'partials/content/fancy_buttons'
@import 'partials/content/overview'
@import 'partials/content/pagination'
@import 'partials/content/cyt'

@import 'partials/content/application'

// Headers styling
h1,
Expand Down
187 changes: 0 additions & 187 deletions app/stylesheets/partials/_invoice.sass

This file was deleted.

2 changes: 2 additions & 0 deletions app/stylesheets/partials/_layout.sass
@@ -1,5 +1,7 @@
@import "blueprint/liquid"
@import "compass/utilities/lists/horizontal-list"
@import 'partials/layout/header'
@import 'partials/layout/navigation'

body
+blueprint-liquid-grid
Expand Down
2 changes: 0 additions & 2 deletions app/stylesheets/partials/_navigation.sass

This file was deleted.

2 changes: 1 addition & 1 deletion app/stylesheets/partials/_sidebar.sass
@@ -1,4 +1,4 @@
#sidebar
.sidebar
.contextual
a
width: 100%
Expand Down
9 changes: 0 additions & 9 deletions app/stylesheets/partials/colors.sass

This file was deleted.

File renamed without changes.
@@ -1,8 +1,7 @@
// Imports
@import "compass/css3/box-shadow"
@import 'partials/formtastic'
@import 'partials/formtastic_cyt'
@import 'partials/pagination'
@import 'partials/content/formtastic/formtastic'
@import 'partials/content/formtastic/formtastic_cyt'

// CyT **
body
Expand All @@ -28,12 +27,15 @@ body

// Content
#content
background-color: white
margin: 0px
border: 1px solid #dddddd
padding: $content_padding
+sanserif-font
font-size: $text_size

#content-column
background-color: white
border: 1px solid #dddddd
margin-left: -2px
+border-radius($border_radius)

* html #content
Expand All @@ -42,23 +44,31 @@ body
padding: $content_padding

html>body
#content, #sidebar
#content-column,
#sidebar-column
min-height: 600px

* html body
#content, #sidebar
#content-column,
#sidebar-column
height: 600px

// Sidebar
#sidebar
.sidebar,
#sidebar-column
background-color: white
margin: 0px
border: 1px solid #dddddd
padding: $content_padding
+sanserif-font
font-size: $text_size
+border-radius($border_radius)

.sidebar
margin: 0px
padding-left: 10px
margin-bottom: 10px
ul
+no-bullets
#sidebar-column
margin-right: 10px
border: 1px solid #dddddd
// Login form
#login-form
table
Expand Down Expand Up @@ -92,10 +102,21 @@ h2, h3, h4
margin-right: 0.5em
float: left

// Icons
.destroy
float: right
// Forms
.fieldWithErrors
display: inline
input
border-color: #dd0000

form
&.box
background: #ffffdd
padding: 6px
margin-bottom: 6px
border: 1px solid #d7d7d7
display: block

// Icons
td.action-links
border: none 0px

Expand Down Expand Up @@ -131,18 +152,6 @@ th.action-links
line-height: 48px
vertical-align: middle

.icon-add
background-image: url(/images/16x16/add.png)

.icon-delete
background-image: url(/images/16x16/remove.png)

.icon-edit
background-image: url(/images/16x16/edit.png)

.icon-index
background-image: url(/images/16x16/index.png)

// restful-authentication
#right-menu
float: right
Expand Down
8 changes: 4 additions & 4 deletions app/stylesheets/partials/content/_flash_errors.sass
Expand Up @@ -11,25 +11,25 @@
div.flash
margin-top: 8px
&.error
background: url(../images/false.png) 8px 5px no-repeat
background: url(/images/false.png) 8px 5px no-repeat
background-color: #ffe3e3
border-color: #550000
color: #550000

#errorExplanation
background: url(../images/false.png) 8px 5px no-repeat
background: url(/images/false.png) 8px 5px no-repeat
background-color: #ffe3e3
border-color: #550000
color: #550000

div.flash.notice
background: url(../images/true.png) 8px 5px no-repeat
background: url(/images/true.png) 8px 5px no-repeat
background-color: #dfffdf
border-color: #9fcf9f
color: #005f00

div.flash.alert
background: url(../images/false.png) 8px 5px no-repeat
background: url(/images/false.png) 8px 5px no-repeat
background-color: #ffe3e3
border-color: #550000
color: #550000
Expand Down

0 comments on commit 292772c

Please sign in to comment.