Skip to content

Commit

Permalink
tweaks realated to #373, #371, and #370
Browse files Browse the repository at this point in the history
  • Loading branch information
caseymm committed Jul 18, 2016
1 parent b226603 commit b88f026
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 12 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/autotune/application.js

Large diffs are not rendered by default.

36 changes: 31 additions & 5 deletions app/assets/stylesheets/autotune/_core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ html{
.row{
margin: 0 -15px;
}
&.projects{
padding-top: 40px;
}
}

.margin-top {
Expand Down Expand Up @@ -125,13 +128,29 @@ label.block {
}

#split-bar {
background-color: transparent;
background-color: lighten(color(border, light), 5.5%);
height: 100%;
width: 8px;
width: 16px;
cursor: col-resize;
position: fixed;
top: 0px;
margin-left: -20px;
top: 67px;
margin-left: -35px;
@media (max-width: $screen-sm){
display: none;
}
&:before {
content: '.';
position: absolute;
font-size: 14px;
color: color(actionable, light);
text-shadow: 0 7px color(actionable, light), 0 14px color(actionable, light), 0 21px color(actionable, light), 6px 0 color(actionable, light), 6px 7px color(actionable, light), 6px 14px color(actionable, light), 6px 21px color(actionable, light);
top: 50%;
margin-top: -67px;
left: 3px;
@media (max-width: $screen-sm){
display: none;
}
}
}

#shareText{
Expand Down Expand Up @@ -240,7 +259,7 @@ label.block {

.navbar{
min-height: 30px;
z-index: 3;
z-index: 4;
.navbar-header{
@media (max-width: 767px){
float: none;
Expand Down Expand Up @@ -691,6 +710,7 @@ label.block {
padding-bottom: 70px;
@media (max-width: $screen-sm){
padding-bottom: 20px;
padding-left: 15px;
}
}

Expand All @@ -699,9 +719,11 @@ label.block {
position:fixed;
right:0px;
padding-bottom: 50px;
padding-left: 35px;
@media (max-width: $screen-sm){
position: relative;
float: none;
padding-left: 15px;
ul.nav{
display: none;
}
Expand Down Expand Up @@ -879,3 +901,7 @@ ul.nav.nav-pills{
padding-top: 0px;
}
}

.top-space{
margin-top: 15px;
}
9 changes: 6 additions & 3 deletions app/assets/stylesheets/autotune/_form_editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@
text-align: center;
border-bottom: none;
position: fixed;
top: 32px;
top: 33px;
width: 100%;
background-color: color(background);
z-index: 3;
li{
z-index: 3;
display:inline-block;
Expand Down Expand Up @@ -126,7 +127,9 @@
top: 60px;
}
.tab-content{
top: 92px;
top: 93px;
}
.m-page-heading, .container.projects{
padding-top: 68px;
}

}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/fashion/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $btn-color: #222222;
$primary-text-color: #0F286B;
$secondary-text-color: #222222;
$positive-text-color: #223D02;
$negative-text-color: #550000;
$negative-text-color: #340000;
$cautionary-text-color: #282E35;
$info-text-color: $cautionary-text-color;

Expand Down
2 changes: 1 addition & 1 deletion appjs/templates/project_list.ejs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="container" style="padding-top: 40px;">
<div class="container projects">
<div class="list-page-header">
<div class="new-button">
<a id="new-project" class="btn btn-primary"
Expand Down

0 comments on commit b88f026

Please sign in to comment.