Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extracted color values out into theme.less #973

Closed
wants to merge 6 commits into from
Closed

Extracted color values out into theme.less #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb85979
Updated .gitignore to ignore .svn directories.
justindarc Sep 19, 2011
7e08c3c
Merge remote-tracking branch 'upstream/master'
justindarc Sep 25, 2011
aae3e23
Resolved conflict in .gitignore.
justindarc Jan 12, 2012
a83d25e
Started extracting out color variables to a new 'theming.less' file f…
justindarc Jan 12, 2012
072d11e
Finished pulling out color-related styles into 'theme.less' for simpl…
justindarc Jan 12, 2012
6512a4e
Extracted color settings for the topbar drop-down menus.
justindarc Jan 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions lib/forms.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fieldset {
padding-left: 150px;
font-size: @basefont * 1.5;
line-height: 1;
color: @grayDark;
color: @darkerGrayColor;
*padding: 0 0 5px 145px; /* IE6-7 */
*line-height: 1.5; /* IE6-7 */
}
Expand Down Expand Up @@ -47,7 +47,7 @@ label {
float: left;
width: 130px;
text-align: right;
color: @grayDark;
color: @darkerGrayColor;
}

// Shift over the inside div to align all label's relevant content
Expand All @@ -72,7 +72,7 @@ select,
padding: 4px;
font-size: @basefont;
line-height: @baseline;
color: @gray;
color: @darkGrayColor;
border: 1px solid #ccc;
.border-radius(3px);
}
Expand All @@ -95,7 +95,7 @@ input[type=radio] {
}

input[type=file] {
background-color: @white;
background-color: @whiteColor;
padding: initial;
border: initial;
line-height: initial;
Expand All @@ -120,7 +120,7 @@ input[type=file] {
// Make multiple select elements height not fixed
select[multiple] {
height: inherit;
background-color: @white; // Fixes Chromium bug of unreadable items
background-color: @whiteColor; // Fixes Chromium bug of unreadable items
}

textarea {
Expand All @@ -129,7 +129,7 @@ textarea {

// For text that needs to appear as an input but should not be an input
.uneditable-input {
background-color: @white;
background-color: @whiteColor;
display: block;
border-color: #eee;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
Expand All @@ -138,10 +138,10 @@ textarea {

// Placeholder text gets special styles; can't be bundled together though for some reason
:-moz-placeholder {
color: @grayLight;
color: @lightGrayColor;
}
::-webkit-input-placeholder {
color: @grayLight;
color: @lightGrayColor;
}

// Focus states
Expand Down Expand Up @@ -197,15 +197,15 @@ select:focus {
}
// Error
form .clearfix.error {
.formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%));
.formFieldState(lighten(@redColor, 5%), lighten(@redColor, 25%), lighten(@redColor, 50%));
}
// Warning
form .clearfix.warning {
.formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%));
.formFieldState(darken(@yellowColor, 15%), darken(@yellowColor, 10%), lighten(@yellowColor, 25%));
}
// Success
form .clearfix.success {
.formFieldState(#468847, #57a957, lighten(#57a957, 30%));
.formFieldState(darken(@greenColor, 5%), lighten(@greenColor, 5%), lighten(@greenColor, 35%));
}


Expand Down Expand Up @@ -287,18 +287,18 @@ textarea[disabled],
input[readonly],
select[readonly],
textarea[readonly] {
background-color: #f5f5f5;
border-color: #ddd;
background-color: lighten(@lighterGrayColor, 6%);
border-color: darken(@lighterGrayColor, 3%);
cursor: not-allowed;
}

// Actions (the buttons)
.actions {
background: #f5f5f5;
background: lighten(@lighterGrayColor, 6%);
margin-top: @baseline;
margin-bottom: @baseline;
padding: (@baseline - 1) 20px @baseline 150px;
border-top: 1px solid #ddd;
border-top: 1px solid darken(@lighterGrayColor, 3%);
.border-radius(0 0 3px 3px);
.secondary-action {
float: right;
Expand All @@ -317,7 +317,7 @@ textarea[readonly] {
.help-block {
font-size: @basefont;
line-height: @baseline;
color: @grayLight;
color: @lightGrayColor;
}
.help-inline {
padding-left: 5px;
Expand All @@ -333,7 +333,7 @@ textarea[readonly] {

// Inline Fields (input fields that appear as inline objects
.inline-inputs {
color: @gray;
color: @darkGrayColor;
span {
padding: 0 2px 0 1px;
}
Expand All @@ -359,14 +359,14 @@ textarea[readonly] {
margin-right: -1px;
font-weight: normal;
line-height: 18px;
color: @grayLight;
color: @lightGrayColor;
text-align: center;
text-shadow: 0 1px 0 @white;
text-shadow: 0 1px 0 @whiteColor;
.border-radius(3px 0 0 3px);
}
.active {
background: lighten(@green, 30);
border-color: @green;
background: lighten(@greenColor, 30);
border-color: @greenColor;
}
}
.input-prepend {
Expand Down Expand Up @@ -405,7 +405,7 @@ textarea[readonly] {
text-align: left;
white-space: normal;
strong {
color: @gray;
color: @darkGrayColor;
}
small {
font-size: @basefont - 2;
Expand Down
6 changes: 3 additions & 3 deletions lib/mixins.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}

// Input placeholder text
.placeholder(@color: @grayLight) {
.placeholder(@color: @lightGrayColor) {
:-moz-placeholder {
color: @color;
}
Expand Down Expand Up @@ -143,10 +143,10 @@

// Add an alphatransparency value to any background or border color (via Elyse Holladay)
#translucent {
.background(@color: @white, @alpha: 1) {
.background(@color: @whiteColor, @alpha: 1) {
background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
}
.border(@color: @white, @alpha: 1) {
.border(@color: @whiteColor, @alpha: 1) {
border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
background-clip: padding-box;
}
Expand Down
Loading