Commit f4ceb8d0 authored by RawKStar77's avatar RawKStar77

Remove $window dependency in markdown directive

Covert px values in markdown-editor.scss to use em. Note: I did this for all values except min-height on .markdown-preview which for some strange reason caused a weird flicker in Firefox.

Add 'markdown-' namespace to .preview and .preview-toggle classes.

Unnested CSS in markdown-editor.scss. Everything is well namespaced now so this is no longer necessary.

Apply consistent sentence case to the title attributes of the markdown tools.
parent ca08c909
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# the markdown editor. # the markdown editor.
### ###
markdown = ['$filter', '$timeout', '$window', ($filter, $timeout, $window) -> markdown = ['$filter', '$timeout', ($filter, $timeout) ->
link: (scope, elem, attr, ctrl) -> link: (scope, elem, attr, ctrl) ->
return unless ctrl? return unless ctrl?
...@@ -19,9 +19,6 @@ markdown = ['$filter', '$timeout', '$window', ($filter, $timeout, $window) -> ...@@ -19,9 +19,6 @@ markdown = ['$filter', '$timeout', '$window', ($filter, $timeout, $window) ->
if input.selectionStart != undefined if input.selectionStart != undefined
startPos = input.selectionStart startPos = input.selectionStart
endPos = input.selectionEnd endPos = input.selectionEnd
if $window.getSelection().toString()
selectedText = $window.getSelection().toString()
else
selectedText = input.value.substring(startPos, endPos) selectedText = input.value.substring(startPos, endPos)
textBefore = input.value.substring(0, (startPos)) textBefore = input.value.substring(0, (startPos))
textAfter = input.value.substring(endPos) textAfter = input.value.substring(endPos)
......
@import 'compass/css3/user-interface';
//MARKDOWN EDITOR ////////////////////////// //MARKDOWN EDITOR //////////////////////////
[markdown] { .markdown-preview {
.preview {
overflow: auto; overflow: auto;
border: 1px solid $gray-lighter; border: .1em solid $gray-lighter;
background-color: $gray-lightest; background-color: $gray-lightest;
min-height: 120px; min-height: 120px;
padding-left: 10px; padding-left: 0.9em;
resize: vertical; resize: vertical;
} }
.markdown-tools { .markdown-tools {
margin-top: 10px; border-top: .1em solid #D3D3D3;
border-top: 1px solid #D3D3D3; border-left: .1em solid #D3D3D3;
border-left: 1px solid #D3D3D3; border-right: .1em solid #D3D3D3;
border-right: 1px solid #D3D3D3; border-radius: .15em .15em 0 0;
border-radius: 2px 2px 0 0;
width: 100%; width: 100%;
margin-bottom: -1px; margin-bottom: -.1em;
padding: .7em .7em .7em .5em; padding: .7em .7em .7em .5em;
user-select: none; @include user-select(none);
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
&.disable { &.disable {
.markdown-tools-button { .markdown-tools-button {
...@@ -32,7 +27,7 @@ ...@@ -32,7 +27,7 @@
} }
} }
.markdown-tools-button {padding: 5px;} .markdown-tools-button {padding: .4em;}
.markdown-tools-button, .markdown-tools-toggle, .icon-markdown { .markdown-tools-button, .markdown-tools-toggle, .icon-markdown {
color: $gray; color: $gray;
...@@ -42,8 +37,7 @@ ...@@ -42,8 +37,7 @@
} }
} }
.preview-toggle { .markdown-preview-toggle {
float: right; float: right;
} }
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment