Skip to content
This repository has been archived by the owner. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
design fully implemented?
  • Loading branch information
Lauren McCarthy committed Jan 23, 2016
commit 3c763d97df111bb71d74716e1df01a14e78ecc54
51 changes: 46 additions & 5 deletions app/editor/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ div#editor-container {
background: #fdfdfd;
}

.ace_scroller {
top: 21px !important;
}

.ace_editor {
overflow: visible !important;
}
Expand All @@ -48,18 +52,21 @@ div#editor-container {
border-right: 1px solid rgba(153, 153, 153, 0.3);
}

.ace_gutter-active-line {
margin-top: 21px;
}

.ace_gutter-layer {
width: 53px !important;
margin-top: 21px !important;
}


.ace_gutter-cell {
background-image: none !important;
background-position: 2px center !important;
padding-right: 15px !important;
}


.ace_warning {
background-color: rgba(255, 190, 5, 0.3) !important;
}
Expand Down Expand Up @@ -148,20 +155,39 @@ body.horizontal {
border-radius: 0 !important;
border: none !important;
padding: 0 !important;
overflow: visible !important;
}

.ace_replace_form {
width: 365px !important;
height: 134px !important;
background-color: #f4f4f4 !important;
box-shadow: 0px 12px 12px rgba(0, 0, 0, 0.16) !important;
margin-top: 80px !important;
border: none !important;
padding: 0 !important;
}

.ace_search_form .ace_search_field {
top: 51px !important;
}

.ace_replace_form .ace_search_field {
top: 131px !important;
}

.ace_search_field {
width: 324px !important;
height: 40px !important;
padding: 10px !important;
position: absolute !important;
top: 51px !important;
left: 22px !important;
background-color: white !important;
outline: 0 !important;
border: 1px solid #979797 !important;
}
.ace_search_form, .ace_replace_form {

.ace_search_form {
border: none !important;
padding: 0 !important;
margin: 0 !important;
Expand Down Expand Up @@ -192,14 +218,20 @@ body.horizontal {
color: #b5b5b5 !important;
opacity: 0.75 !important;
position: absolute !important;
top: 100px !important;
height: 20px !important;

&:hover {
opacity: 0.35 !important;
}
}

.ace_searchbtn {
top: 100px !important;
}
.ace_replacebtn {
top: 180px !important;
}

.ace_search_form button:nth-of-type(1) {
left: 257px !important;
}
Expand Down Expand Up @@ -227,3 +259,12 @@ body.horizontal {
opacity: 0.65 !important;
}
}

.ace_replace_form button:nth-of-type(1) {
margin-left: 31px !important;
}

.ace_replace_form button:nth-of-type(2) {
margin-left: 319px !important;
width: 27px !important;
}
16 changes: 13 additions & 3 deletions app/tabs/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
}

li:first-child div {
border-top-left-radius: 4px;
border-top-left-radius: 8px;
}

li:nth-last-child(2) div {
border-top-right-radius: 4px;
border-top-right-radius: 8px;
border-right: none;
}

Expand All @@ -82,11 +82,18 @@
a.delete{
color: #aaa;
float: right;
padding-right: 12px;
padding-right: 18px;
background: url('../images/close-button.svg');
background-repeat: no-repeat;
margin-top: 10px;
height: 10px;
}
.selected a{
color: #333333;
}
a.delete:hover {
opacity: 0.5;
}
}

#add {
Expand All @@ -100,5 +107,8 @@
display:block;
color: #333333;
}
a:hover {
opacity: 0.5;
}
}

2 changes: 1 addition & 1 deletion app/tabs/tab.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="{{className}}"><a href="#" v-show="!hidden" v-on="click: $root.openFile(this.path)">{{name}}{{file.contents !== file.lastSavedContents ? '*' : ''}}</a>&nbsp
<a class="delete" href="#" v-show="!hidden" v-on="click: $root.closeFile(this.path)">x</a>
<a class="delete" href="#" v-show="!hidden" v-on="click: $root.closeFile(this.path)"></a>
</div>


2 changes: 1 addition & 1 deletion app/window/window.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ body {
font-size: 12px;
padding-left: 20px;
color: #b5b5b5;
margin-top: 10px;
margin-top: 14px;
margin-bottom: 10px;
cursor: default;
float:left;
Expand Down