Skip to content

Commit

Permalink
updated styles with the latest from the prototype
Browse files Browse the repository at this point in the history
  • Loading branch information
jlong committed Apr 1, 2011
1 parent 635ce52 commit d10162e
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 37 deletions.
2 changes: 1 addition & 1 deletion public/stylesheets/admin/main.css

Large diffs are not rendered by default.

43 changes: 19 additions & 24 deletions public/stylesheets/sass/admin/main.sass
@@ -1,32 +1,27 @@
// main.css - main stylesheet for the Radiant admin interface
// Variables
@import partials/base

// Modules
@import compass
@import modules/boxes
@import modules/links
// Common Variables and Modules
@import "partials/base"

+global-reset

// Partials
@import partials/typography
@import partials/layout
@import partials/header
@import partials/avatars
@import partials/dropdown
@import partials/messages
@import partials/forms
@import partials/index
@import partials/content
@import partials/actions
@import partials/footer
@import partials/popup
@import partials/tabcontrol
@import partials/dateinput
@import partials/toolbar
@import partials/validations
@import "partials/typography"
@import "partials/layout"
@import "partials/header"
@import "partials/avatars"
@import "partials/dropdown"
@import "partials/messages"
@import "partials/forms"
@import "partials/index"
@import "partials/content"
@import "partials/actions"
@import "partials/footer"
@import "partials/popup"
@import "partials/tabcontrol"
@import "partials/dateinput"
@import "partials/toolbar"
@import "partials/validations"

// Deprecated
@import partials/deprecated
@import "partials/deprecated""
12 changes: 11 additions & 1 deletion public/stylesheets/sass/admin/partials/_base.sass
Expand Up @@ -4,4 +4,14 @@ $base-font-size: 95%

// Links
$base-link-color: #0066cc
$alt-link-color: red
$alt-link-color: red

// Header
$header: #ca0000 !default
$primary-tab: rgba(white, 0.3)
$primary-tab-current: white

// Modules
@import "compass"
@import "../modules/links"
@import "../modules/boxes"
5 changes: 4 additions & 1 deletion public/stylesheets/sass/admin/partials/_content.sass
Expand Up @@ -24,7 +24,7 @@ body.reversed
font-size: 125%
margin: -20px -20px 20px
padding: 15px 20px
text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.1)
text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.1)

.fullcover
position: absolute
Expand All @@ -34,11 +34,14 @@ body.reversed
right: 0
bottom: 0
left: 0

.clipped
overflow: hidden

.grey_out
background: #666
background: rgba(0, 0, 0, 0.7)

.preview_tools
color: #000
position: fixed
Expand Down
4 changes: 0 additions & 4 deletions public/stylesheets/sass/admin/partials/_header.sass
@@ -1,7 +1,3 @@
$header: #ca0000 !default
$primary-tab: rgba(white, 0.3)
$primary-tab-current: white

#header
font-size: 90%
background: $header
Expand Down
21 changes: 16 additions & 5 deletions public/stylesheets/sass/admin/partials/_popup.sass
Expand Up @@ -3,7 +3,12 @@ div.popup
background-color: white
border: 1px solid #777
padding: 10px 20px
font-size: 90%

strong
font-weight: bold

em
font-style: italic

.busy
float: right
Expand All @@ -13,15 +18,21 @@ div.popup
background: #c5dff5
+linear-gradient(color_stops(#e5f5ff, #c5dff5))
border-bottom: 1px solid #a7cdf0
font-size: 120%
font-size: 100%
margin: -10px -20px 20px -20px
padding: 6px 10px

p.intro
font-size: 90%

label
display: block
font-size: 90%
font-size: 85%
&.inline
display: inline
span.hint
font-size: 90%
color: #666

input.button
font-size: 120%
Expand All @@ -38,10 +49,10 @@ div.popup
margin: -1px 0 0

.buttons
font-size: 90%
margin-top: 1.5em
font-size: 85%
input.button
font-size: 130%
font-size: 120%
a.cancel
color: $alt-link-color

Expand Down
3 changes: 2 additions & 1 deletion public/stylesheets/sass/admin/partials/_typography.sass
@@ -1,6 +1,7 @@
body
font-size: $base-font-size
font-family: $base-font-family
line-height: 1.4

a
+default-link
Expand Down Expand Up @@ -42,7 +43,7 @@ input[type=image]
border: none
vertical-align: middle

.big
input.big
font-size: 120%

#change_password span, span.info, span.error
Expand Down

0 comments on commit d10162e

Please sign in to comment.