Browse Source

Refactored base to scss.

Update style.

Fix whitespace.
pull/30/head
Evan Theurer 12 years ago
parent
commit
73493ee1d0
  1. 13
      src/styles/color-pallete.html
  2. 10
      src/styles/global/_angular.scss
  3. 187
      src/styles/global/_base.scss
  4. 12
      src/styles/global/_mixins.scss
  5. 3
      src/styles/global/_variables.scss
  6. 1
      src/styles/main.scss

13
src/styles/color-pallete.html

@ -97,4 +97,17 @@
<td class="color-block" style="background-color: rgba(0,0,0,.4);"></td> <td class="color-block" style="background-color: rgba(0,0,0,.4);"></td>
<td class="color-block" style="background-color: rgba(0,0,0,.3);"></td> <td class="color-block" style="background-color: rgba(0,0,0,.3);"></td>
</tr> </tr>
<tr>
<td class="color-desc">
$grey5: #aaa
</td>
<td class="color-desc">
$grey6: #ddd
</td>
</tr>
<tr>
<td class="color-block" style="background-color: #aaa;"></td>
<td class="color-block" style="background-color: #ddd;"></td>
</tr>
</table> </table>

10
src/styles/global/_angular.scss

@ -18,6 +18,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
display: none; [ng\:cloak],
[ng-cloak],
[data-ng-cloak],
[x-ng-cloak],
.ng-cloak,
.x-ng-cloak {
display: none;
} }

187
src/styles/global/_base.scss

File diff suppressed because one or more lines are too long

12
src/styles/global/_mixins.scss

@ -9,6 +9,7 @@
-khtml-user-select: $select; -khtml-user-select: $select;
-moz-user-select: $select; -moz-user-select: $select;
-ms-user-select: $select; -ms-user-select: $select;
-o-user-select: $select;
-webkit-user-select: $select; -webkit-user-select: $select;
user-select: $select; user-select: $select;
} }
@ -21,3 +22,14 @@
-webkit-box-shadow: $shadow; -webkit-box-shadow: $shadow;
box-shadow: $shadow; box-shadow: $shadow;
} }
@mixin transition-property($property) {
transition-property: $property;
-webkit-transition-property: $property;
}
@mixin transition-duration($duration) {
transition-duration: $duration;
-webkit-transition-duration: $duration;
}

3
src/styles/global/_variables.scss

@ -29,6 +29,9 @@ $bordercolor: #ccc;
$actioncolor1: rgb(132,184,25); $actioncolor1: rgb(132,184,25);
$actioncolor2: rgb(0,149,52); $actioncolor2: rgb(0,149,52);
$light-text: #aaa;
$lighter-text: #ddd;
$grey3: rgba(0,0,0,.3); $grey3: rgba(0,0,0,.3);
$grey4: rgba(0,0,0,.4); $grey4: rgba(0,0,0,.4);
$dgrey: rgb(34,34,34); $dgrey: rgb(34,34,34);

1
src/styles/main.scss

@ -20,7 +20,6 @@
*/ */
@import "global/variables"; @import "global/variables";
// @import "compass";
@import "compass"; @import "compass";
@import "libs/libs"; @import "libs/libs";

Loading…
Cancel
Save