Skip to content

Commit

Permalink
Merge branch 'feature/titles' into develop
Browse files Browse the repository at this point in the history
* feature/titles:
  fixed cucumber feature
  scaffold titles fixes
  titles fixes
  titles fixes
  add copyrights
  Revert title
  Added titles and doc to the dashboard
  Update changelog
  Relocate css files
  Use in the show scaffold template generator variables
  css-styling-and-clean-up
  Fix cucumber features
  add styleguides for forms
  Add basic styleguides
  some styling elements
  Make steps more clean
  Resort steps in the given/when/then order in the step files
  Move comments for mysql part
  Remove variables remaining from parallel_test gem
  css cleanup
  • Loading branch information
rustemginiyatullin committed Jan 20, 2012
2 parents d59b638 + 49049b5 commit 2fffb96
Show file tree
Hide file tree
Showing 56 changed files with 1,782 additions and 1,017 deletions.
87 changes: 87 additions & 0 deletions app/assets/stylesheets/addons/fade_down.css.scss
@@ -0,0 +1,87 @@
@-webkit-keyframes fadeOutDownBig {
0% {
opacity: 1;
-webkit-transform: translateY(0);
}

100% {
opacity: 0;
-webkit-transform: translateY(2000px);
}
}

@-moz-keyframes fadeOutDownBig {
0% {
opacity: 1;
-moz-transform: translateY(0);
}

100% {
opacity: 0;
-moz-transform: translateY(2000px);
}
}

@-ms-keyframes fadeOutDownBig {
0% {
opacity: 1;
-ms-transform: translateY(0);
}

100% {
opacity: 0;
-ms-transform: translateY(2000px);
}
}

@-o-keyframes fadeOutDownBig {
0% {
opacity: 1;
-o-transform: translateY(0);
}

100% {
opacity: 0;
-o-transform: translateY(2000px);
}
}

@keyframes fadeOutDownBig {
0% {
opacity: 1;
transform: translateY(0);
}

100% {
opacity: 0;
transform: translateY(2000px);
}
}

@mixin fadedown() {
-webkit-backface-visibility: hidden;
-moz-backface-visibility: hidden;
-ms-backface-visibility: hidden;
backface-visibility: hidden;
-webkit-animation-duration: 1s;
-webkit-animation-delay: 5s;
-webkit-animation-timing-function: ease;
-webkit-animation-fill-mode: both;
-moz-animation-duration: 1s;
-moz-animation-delay: 5s;
-moz-animation-timing-function: ease;
-moz-animation-fill-mode: both;
-ms-animation-duration: 1s;
-ms-animation-delay: 5s;
-ms-animation-timing-function: ease;
-ms-animation-fill-mode: both;
animation-duration: 1s;
animation-delay: 5s;
animation-timing-function: ease;
animation-fill-mode: both;
-webkit-animation-name: fadeOutDownBig;
-moz-animation-name: fadeOutDownBig;
-ms-animation-name: fadeOutDownBig;
-o-animation-name: fadeOutDownBig;
animation-name: fadeOutDownBig;
}
15 changes: 15 additions & 0 deletions app/assets/stylesheets/addons/micro_clearfix.css.scss
@@ -0,0 +1,15 @@
/* For modern browsers */
.cf:before,
.cf:after {
content:"";
display:table;
}

.cf:after {
clear:both;
}

/* For IE 6/7 (trigger hasLayout) */
.cf {
zoom:1;
}
6 changes: 6 additions & 0 deletions app/assets/stylesheets/addons/mixins.css.scss
@@ -0,0 +1,6 @@
@mixin opacity($property: 100) {
filter:alpha(opacity=$property);
-moz-opacity: $property/100;
-khtml-opacity: $property/100;
opacity: $property/100;
}
53 changes: 53 additions & 0 deletions app/assets/stylesheets/addons/shadows.css.scss
@@ -0,0 +1,53 @@
.drop-shadow {
position:relative;
@include box-shadow(0 0 3px rgba(0, 0, 0, 0.1), 0 0 30px rgba(255, 255, 255, 0.07) inset);
&:before,
&:after {
content:"";
position:absolute;
z-index:-2;
}
}


.lifted:before,
.lifted:after {
bottom: 15px;
left: 10px;
width: 50%;
height: 27%;
max-width: 300px;
@include box-shadow(0 18px 8px rgba(0, 0, 0, 0.3));
@include transform(rotate(-3deg));
}

.lifted:after {
right: 10px;
left: auto;
@include transform(rotate(3deg));
}

.curved:before {
top:10px;
bottom:10px;
left:0;
right:50%;
-webkit-box-shadow:0 0 15px rgba(0,0,0,0.6);
-moz-box-shadow:0 0 15px rgba(0,0,0,0.6);
box-shadow:0 0 15px rgba(0,0,0,0.6);
-moz-border-radius:10px / 100px;
border-radius:10px / 100px;
}

.curved-vt-2:before {
right:0;
}

.curved-hz-1:before {
top:50%;
bottom:0;
left:10px;
right:10px;
-moz-border-radius:100px / 10px;
border-radius:100px / 10px;
}
6 changes: 6 additions & 0 deletions app/assets/stylesheets/addons/vars.css.scss
@@ -0,0 +1,6 @@
/* Colors */
$body_color: #dfe0e3;


/* Sizes */
$layout_width: 990px;
27 changes: 14 additions & 13 deletions app/assets/stylesheets/application.css.scss
@@ -1,16 +1,17 @@
@import 'bourbon';
@import 'defaults/reset';
@import 'defaults/lists';
@import 'defaults/forms';
@import 'defaults/tables';

@import 'common';
@import 'navigation';
@import 'forms';
@import 'login';




@import 'addons/mixins';
@import 'addons/vars';
@import 'addons/micro_clearfix';
@import 'addons/shadows';
@import 'addons/fade_down';
@import 'resets/main';
@import 'resets/forms';


@import 'styling/main';
@import 'styling/header';
@import 'styling/tables';
@import 'styling/types';
@import 'styling/forms';
@import 'styling/flash_messages';
@import 'styling/footer';

0 comments on commit 2fffb96

Please sign in to comment.