Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-07 14:35:28 +02:00
Code Releases Activity

scss tidy up

Browse source
This commit is contained in:
Harvey Kandola 2016-04-29 17:04:09 -07:00
parent 8fe5923200
commit b933cf4c9d
5 changed files with 9 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/app/pods/setup/controller.js
View file

@ -46,7 +46,6 @@ export default Ember.Controller.extend(NotifierMixin, {
dataType: "text",
success: function() {
var credentials = Encoding.Base64.encode(":" + self.model.email + ":" + self.model.password);
debugger;
window.location.href = "/auth/sso/" + encodeURIComponent(credentials);
},
error: function(x) {

1
app/app/styles/app.scss
View file

@ -14,7 +14,6 @@
@import "view/document/sidebar.scss";
@import "view/document/content.scss";
@import "view/document/wysiwyg.scss";
@import "view/document/diff.scss";
@import "view/document/editor.scss";
@import "view/document/wizard.scss";
@import "vendor.scss";

9
app/app/styles/base.scss
View file

@ -93,3 +93,12 @@ ul {
list-style-type: none;
}
}
.clearfix:before,
.clearfix:after {
content: " ";
display: table;
}
.clearfix:after {
clear: both;
}

190
app/app/styles/view/document/diff.scss
View file

@ -1,190 +0,0 @@
$diff-removed: #fdc6c6; /* light red */
$diff-added: #71FF9E; /* light green */;
$diff-changed: #c6c6fd; /* light blue */
$diff-conflicted: #f781be; /* light rose */
.page-history
{
ul
{
// height: 140px;
width: auto;
overflow-x: auto;
overflow-y: hidden;
white-space: nowrap;
margin: 0;
padding: 0;
li
{
margin: 20px 20px;
padding: 0;
text-align: center;
list-style-type: none;
cursor: pointer;
display: inline-block;
.time-ago
{
font-size: 12px;
color: $color-gray;
padding-bottom: 5px;
}
.who
{
font-size: 12px;
color: $color-off-black;
margin-top: 15px;
}
&.active
{
@include border-bottom(1px);
}
}
}
.diff-report
{
margin: 20px 20px;
.summary
{
font-size: 15px;
text-align: center;
margin: 0 0 20px 0;
}
.legend
{
text-align: center;
margin: 10px 0 30px 0;
// display: none;
.add-key
{
background-color: $color-off-white;
width: 100px;
text-transform: uppercase;
font-size: 12px;
font-weight: bold;
display: inline-block;
margin: 0 30px;
@include border-radius(2px);
padding: 5px 10px;
color: $diff-added;
border: 1px solid darken($diff-added, 10%);
}
.changed-key
{
@extend add-key;
color: $diff-changed;
border: 1px solid darken($diff-changed, 10%);
}
.removed-key
{
@extend add-key;
color: $diff-removed;
border: 1px solid darken($diff-removed, 10%);
}
}
span.diff-tag-html
{
}
span.diff-tag-removed
{
text-decoration: line-through;
background-color: $diff-removed;
}
span.diff-tag-added
{
background-color: $diff-added;
}
span.diff-tag-conflict
{
background-color: $diff-conflicted;
}
span.diff-html-added
{
font-size: 100%;
background-color: $diff-added;
}
span.diff-html-removed
{
font-size: 100%;
text-decoration: line-through;
background-color: $diff-removed;
}
span.diff-html-changed
{
background-color: $diff-changed;
}
span.diff-html-conflict
{
background-color: $diff-conflicted;
}
span.diff-html-added img
{
border: 4px solid $diff-added;
}
span.diff-html-removed img
{
border: 4px solid $diff-removed;
}
span.diff-html-changed img
{
border: 4px dotted #000099;
}
/*div.diff-removed-image, div.diff-added-image, div.diff-conflict-image
{
height: 300px;
width: 200px;
position: absolute;
opacity : 0.55;
filter: alpha(opacity=45);
-moz-opacity: 0.45;
}*/
div.diff-removed-image, div.diff-added-image, div.diff-conflict-image
{
margin-top: 2px;
margin-bottom: 2px;
margin-right: 2px;
margin-left: 2px;
}
div.diff-removed-image
{
background-color: $diff-removed;
}
div.diff-added-image
{
background-color: $diff-added;
background-repeat: no-repeat;
}
div.diff-conflict-image
{
background-color: $diff-conflicted;
background-repeat: no-repeat;
}
}
}

3
app/package.json
View file

@ -39,8 +39,5 @@
"ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",
"loader.js": "^4.0.1"
},
"dependencies": {
"ember-cli-sass": "^5.3.1"
}
}