Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: psergus/ngWYSIWYG
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: arbisoft/ngWYSIWYG
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 29, 2016

  1. Copy the full SHA
    047ba56 View commit details
  2. Copy the full SHA
    5cc68e5 View commit details

Commits on Mar 7, 2016

  1. Copy the full SHA
    945d6ba View commit details
Showing with 1,333 additions and 2 deletions.
  1. +191 −1 dist/editor.min.css
  2. +1,142 −1 dist/wysiwyg.min.js
192 changes: 191 additions & 1 deletion dist/editor.min.css
Original file line number Diff line number Diff line change
@@ -1 +1,191 @@
wysiwyg-edit .tinyeditor{border:1px solid #bbb;padding:0 1px 1px;font:12px Verdana,Arial}wysiwyg-edit .tinyeditor iframe{border:none;background:#fff;overflow-x:hidden}wysiwyg-edit .tinyeditor .sizer{min-height:200px;height:400px;position:relative}wysiwyg-edit .tinyeditor .resizer{background:url(images/resize.gif) 15px 15px no-repeat;float:right;height:32px;width:32px;cursor:ns-resize}wysiwyg-edit .tinyeditor .tinyeditor-header{height:auto;border-bottom:1px solid #bbb;background:url(images/header-bg.gif);padding-top:1px}wysiwyg-edit .tinyeditor .tinyeditor-header select{float:left;width:220px;border:1px solid #ccc;background-color:#fff;height:30px;line-height:30px}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group{float:left;height:31px}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-size{margin:0 3px}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-style{margin-right:12px}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-divider{float:left;width:1px;height:30px;background:#ccc}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control{float:left;width:34px;height:30px;cursor:pointer;background-image:url(images/icons.png);background-position-x:0}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control:hover{background-color:#fff;background-position-x:34px}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control.pressed{background-color:#D0CFCF}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control-fa{background-image:none;position:relative}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control-fa i{font-size:16px;margin:8px 5px 0 10px;color:#555}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control-fa div.hr{border:1px solid #555;margin:15px 10px}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group:after{clear:left}wysiwyg-edit .tinyeditor .tinyeditor-footer{height:32px;border-top:1px solid #bbb;background:#f5f5f5;margin-top:10px}wysiwyg-edit .tinyeditor .tinyeditor-footer .toggle{float:left;background:url(images/icons.png) -34px 2px no-repeat;padding:9px 13px 0 31px;height:23px;border-right:1px solid #ccc;cursor:pointer;color:#666}wysiwyg-edit .tinyeditor .tinyeditor-footer .toggle:hover{background-color:#fff}wysiwyg-edit .tinyeditor .resize{float:right;height:32px;width:32px;background:url(images/resize.gif) 15px 15px no-repeat;cursor:s-resize}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-colors-grid{position:absolute;left:0;top:30px;background-color:#fff;width:192px;border:2px solid #000;padding:0;margin:0;z-index:100}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-colors-grid>li{list-style:none;border:2px solid #fff;float:left;width:20px;height:20px}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-colors-grid>li:hover{opacity:.7}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-symbols-grid{position:absolute;left:0;top:30px;background-color:#fff;width:384px;border:2px solid #000;padding:0;margin:0;z-index:100}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-symbols-grid>li{list-style:none;border:1px solid #e7e7e7;float:left;width:30px;height:30px;text-align:center;font-size:1.3em}wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-symbols-grid>li:hover{opacity:.7;font-size:1.7em}@media only screen and (max-width:500px){wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-font,wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-size,wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-style{width:80px}}@media only screen and (max-width:768px){wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-font,wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-size,wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-style{width:80px}}
wysiwyg-edit .tinyeditor {
border: 1px solid #bbb;
padding: 0 1px 1px;
font: 12px Verdana, Arial
}

wysiwyg-edit .tinyeditor iframe {
border: none;
background: #fff;
overflow-x: hidden
}

wysiwyg-edit .tinyeditor .sizer {
min-height: 200px;
height: 400px;
position: relative
}

wysiwyg-edit .tinyeditor .resizer {
background: url(images/resize.gif) 15px 15px no-repeat;
float: right;
height: 32px;
width: 32px;
cursor: ns-resize
}

wysiwyg-edit .tinyeditor .tinyeditor-header {
height: auto;
border-bottom: 1px solid #bbb;
background: url(images/header-bg.gif);
padding-top: 1px
}

wysiwyg-edit .tinyeditor .tinyeditor-header select {
float: left;
width: 220px;
border: 1px solid #ccc;
background-color: #fff;
height: 30px;
line-height: 30px
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group {
float: left;
height: 31px
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-size {
margin: 0 3px
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-style {
margin-right: 12px
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-divider {
float: left;
width: 1px;
height: 30px;
background: #ccc
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control {
float: left;
width: 34px;
height: 30px;
cursor: pointer;
background-image: url(images/icons.png);
background-position-x: 0
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control:hover {
background-color: #fff;
background-position-x: 34px
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control.pressed {
background-color: #D0CFCF
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control-fa {
background-image: none;
position: relative
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control-fa i {
font-size: 16px;
margin: 8px 5px 0 10px;
color: #555
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control-fa div.hr {
border: 1px solid #555;
margin: 15px 10px
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group:after {
clear: left
}

wysiwyg-edit .tinyeditor .tinyeditor-footer {
height: 32px;
border-top: 1px solid #bbb;
background: #f5f5f5;
margin-top: 10px
}

wysiwyg-edit .tinyeditor .tinyeditor-footer .toggle {
float: left;
background: url(images/icons.png) -34px 2px no-repeat;
padding: 9px 13px 0 31px;
height: 23px;
border-right: 1px solid #ccc;
cursor: pointer;
color: #666
}

wysiwyg-edit .tinyeditor .tinyeditor-footer .toggle:hover {
background-color: #fff
}

wysiwyg-edit .tinyeditor .resize {
float: right;
height: 32px;
width: 32px;
background: url(images/resize.gif) 15px 15px no-repeat;
cursor: s-resize
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-colors-grid {
position: absolute;
left: 0;
top: 30px;
background-color: #fff;
width: 192px;
border: 2px solid #000;
padding: 0;
margin: 0;
z-index: 100
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-colors-grid > li {
list-style: none;
border: 2px solid #fff;
float: left;
width: 20px;
height: 20px
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-colors-grid > li:hover {
opacity: .7
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-symbols-grid {
position: absolute;
left: 0;
top: 30px;
background-color: #fff;
width: 384px;
border: 2px solid #000;
padding: 0;
margin: 0;
z-index: 100
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-symbols-grid > li {
list-style: none;
border: 1px solid #e7e7e7;
float: left;
width: 30px;
height: 30px;
text-align: center;
font-size: 1.3em
}

wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-control .ngp-symbols-grid > li:hover {
opacity: .7;
font-size: 1.7em
}

@media only screen and (max-width: 500px) {
wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-font, wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-size, wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-style {
width: 80px
}
}

@media only screen and (max-width: 768px) {
wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-font, wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-size, wysiwyg-edit .tinyeditor .tinyeditor-header .tinyeditor-buttons-group .tinyeditor-style {
width: 80px
}
}
Loading