diff --git a/app.css b/app.css index 7fee5438b..3db491ade 100644 --- a/app.css +++ b/app.css @@ -71,9 +71,9 @@ table { border-collapse: collapse; border-spacing:0; } @font-face { font-family:'Prose'; - src:url('fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.eot'); - src:url('fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.eot?#iefix') format('embedded-opentype'), - url('fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.woff') format('woff'); + src:url('fonts/prose-18e902af311ccc975d09744f6c010443.eot'); + src:url('fonts/prose-18e902af311ccc975d09744f6c010443.eot?#iefix') format('embedded-opentype'), + url('fonts/prose-18e902af311ccc975d09744f6c010443.woff') format('woff'); font-weight:700; font-style:normal; } @@ -611,36 +611,55 @@ ins { .ico.added:before { content: "\f100"; } .ico.cancel:before { content: "\f101"; } -.ico.document:before { content: "\f102"; } -.ico.error:before { content: "\f103"; } -.ico.eye:before { content: "\f104"; } -.ico.folder:before { content: "\f105"; } -.ico.html:before { content: "\f106"; } -.ico.italic:before { content: "\f107"; } -.ico.link:before { content: "\f108"; } -.ico.list:before { content: "\f109"; } -.ico.markdown:before { content: "\f10a"; } -.ico.media:before { content: "\f10b"; } -.ico.metadata:before { content: "\f10c"; } -.ico.modified:before { content: "\f10d"; } -.ico.new-file:before { content: "\f10e"; } -.ico.numbered-list:before { content: "\f10f"; } -.ico.pencil:before { content: "\f110"; } -.ico.picture:before { content: "\f111"; } -.ico.private:before { content: "\f112"; } -.ico.quote:before { content: "\f113"; } -.ico.removed:before { content: "\f114"; } -.ico.renamed:before { content: "\f115"; } -.ico.repos:before { content: "\f116"; } -.ico.rubbish:before { content: "\f117"; } -.ico.search:before { content: "\f118"; } -.ico.settings:before { content: "\f119"; } -.ico.sprocket:before { content: "\f11a"; } -.ico.switch:before { content: "\f11b"; } +.ico.checkmark:before { content: "\f102"; } +.ico.document:before { content: "\f103"; } +.ico.error:before { content: "\f104"; } +.ico.eye:before { content: "\f105"; } +.ico.folder:before { content: "\f106"; } +.ico.html:before { content: "\f107"; } +.ico.italic:before { content: "\f108"; } +.ico.link:before { content: "\f109"; } +.ico.list:before { content: "\f10a"; } +.ico.markdown:before { content: "\f10b"; } +.ico.media:before { content: "\f10c"; } +.ico.metadata:before { content: "\f10d"; } +.ico.modified:before { content: "\f10e"; } +.ico.new-file:before { content: "\f10f"; } +.ico.numbered-list:before { content: "\f110"; } +.ico.pencil:before { content: "\f111"; } +.ico.picture:before { content: "\f112"; } +.ico.private:before { content: "\f113"; } +.ico.quote:before { content: "\f114"; } +.ico.removed:before { content: "\f115"; } +.ico.renamed:before { content: "\f116"; } +.ico.repos:before { content: "\f117"; } +.ico.rubbish:before { content: "\f118"; } +.ico.search:before { content: "\f119"; } +.ico.settings:before { content: "\f11a"; } +.ico.sprocket:before { content: "\f11b"; } +.ico.switch:before { content: "\f11c"; } /* Custom Class Names for ico's */ -.ico.gfm:before { content: "\f10a"; } -.ico.htmlmixed:before { content: "\f106"; } +.ico.gfm:before { content:'\f10b'; } +.ico.htmlmixed:before { content:'\f107'; } + +.error .heading .status, +.saved .heading .status { + background:#f8f8f8; + } + .saved .heading .status { + -webkit-animation-name:saved; + -moz-animation-name:saved; + animation-name:saved; + } + .error .heading .status:before { + content:'\f104'; + color:#db6f6f; + } + .saved .heading .status:before { + content:'\f102'; + color:#90bb74; + } .avatar { background:#f8f8f8; @@ -657,49 +676,45 @@ ins { margin:0 10px 0 0; height:50px; width:50px; + position:relative; } @-webkit-keyframes saved { - 0% { -webkit-transform:scale(1); } - 10%, 20% { -webkit-transform:scale(0.9) rotate(-3deg); } - 30%, 50%, 70%, 90% { -webkit-transform:scale(1.15) rotate(3deg); } - 40%, 60%, 80% { -webkit-transform:scale(1.15) rotate(-3deg); } - 100% { -webkit-transform:scale(1) rotate(0); } + 0% { -webkit-transform:scale(1); opacity:1; } + 100% { -webkit-transform:scale(1.5); opacity:0; } } @-moz-keyframes saved { - 0% { -moz-transform:scale(1); } - 10%, 20% { -moz-transform:scale(0.9) rotate(-3deg); } - 30%, 50%, 70%, 90% { -moz-transform:scale(1.15) rotate(3deg); } - 40%, 60%, 80% { -moz-transform:scale(1.15) rotate(-3deg); } - 100% { -moz-transform:scale(1) rotate(0); } + 0% { -moz-transform:scale(1); opacity:1; } + 100% { -moz-transform:scale(1.5); opacity:0; } } @keyframes saved { - 0% { transform: scale(1); } - 10%, 20% { transform:scale(0.9) rotate(-3deg); } - 30%, 50%, 70%, 90% { transform:scale(1.15) rotate(3deg); } - 40%, 60%, 80% { transform:scale(1.15) rotate(-3deg); } - 100% { transform:scale(1) rotate(0); } + 0% { transform:scale(1); opacity:1; } + 100% { transform:scale(1.5); opacity:0; } } /* Saving States */ -.heading .avatar .ico { - -webkit-animation-duration:1s; - -moz-animation-duration:1s; - animation-duration:1s; +.heading .avatar .status { + position:absolute; + width:50px; + height:50px; + line-height:50px; + font-size:27px; + display:block; + text-align:center; + top:0; + left:0; + -webkit-animation-duration:500ms; + -moz-animation-duration:500ms; + animation-duration:500ms; -webkit-animation-timing-function:ease; -moz-animation-timing-function:ease; animation-timing-function:ease; -webkit-animation-fill-mode:both; -moz-animation-fill-mode:both; animation-fill-mode:both; - -webkit-animation-delay:200ms; - -moz-animation-delay:200ms; - animation-delay:200ms; - } -.saved .heading .avatar .ico { - -webkit-animation-name:saved; - -moz-animation-name:saved; - animation-name:saved; + -webkit-animation-delay:1000ms; + -moz-animation-delay:1000ms; + animation-delay:1000ms; } .heading .icon, @@ -1123,14 +1138,6 @@ ins { margin-bottom:10px; } -/* ------------------------------------------ - Pages: Help ----------------------------------------------*/ -.improve-article { - font-size:20px; - border-top:1px solid #a8afb2; - } - /* ------------------------------------------ Notifications ---------------------------------------------*/ diff --git a/fonts/prose-18e902af311ccc975d09744f6c010443.eot b/fonts/prose-18e902af311ccc975d09744f6c010443.eot new file mode 100644 index 000000000..a385e689c Binary files /dev/null and b/fonts/prose-18e902af311ccc975d09744f6c010443.eot differ diff --git a/fonts/prose-18e902af311ccc975d09744f6c010443.woff b/fonts/prose-18e902af311ccc975d09744f6c010443.woff new file mode 100644 index 000000000..3edca1d48 Binary files /dev/null and b/fonts/prose-18e902af311ccc975d09744f6c010443.woff differ diff --git a/fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.eot b/fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.eot deleted file mode 100644 index e4804e482..000000000 Binary files a/fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.eot and /dev/null differ diff --git a/fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.woff b/fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.woff deleted file mode 100644 index 99d2666e4..000000000 Binary files a/fonts/prose-9d66c1d1adf5ae0b4e94583acf6acf32.woff and /dev/null differ diff --git a/img/icons/added.svg b/img/icons/added.svg index a853b5014..c83cf863e 100644 --- a/img/icons/added.svg +++ b/img/icons/added.svg @@ -24,7 +24,7 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.44721826" + inkscape:zoom="0.47778982" inkscape:cx="533.55476" inkscape:cy="470.11105" inkscape:document-units="px" @@ -32,8 +32,8 @@ showgrid="true" inkscape:window-width="1010" inkscape:window-height="745" - inkscape:window-x="47" - inkscape:window-y="20" + inkscape:window-x="264" + inkscape:window-y="0" inkscape:window-maximized="0"> - + id="path24459" /> diff --git a/img/icons/error.svg b/img/icons/error.svg index 25ef85851..06857a294 100644 --- a/img/icons/error.svg +++ b/img/icons/error.svg @@ -24,9 +24,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.53417969" - inkscape:cx="505.62305" - inkscape:cy="382.46744" + inkscape:zoom="0.57069588" + inkscape:cx="615.21677" + inkscape:cy="549.72696" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -65,11 +65,10 @@ id="layer1" transform="translate(0,-52.3622)"> + style="color:#000000;fill:#434350;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 500,52.3622 c -248.52825,0 -450,201.47175 -450,450 0,248.52825 201.47175,450 450,450 248.52825,0 450,-201.47175 450,-450 0,-248.52825 -201.47175,-450 -450,-450 z m -60,220 120,0 40,40 -20,180 -40,40 -80,0 -40,-40 -20,-180 z m 20,300 80,0 60,60 0,60 -60,60 -80,0 -60,-60 0,-60 z" + id="path5171" + sodipodi:nodetypes="ssssscccccccccccccccccc" /> diff --git a/img/sprite.svg b/img/sprite.svg index b99e8dad7..880c3d4cc 100644 --- a/img/sprite.svg +++ b/img/sprite.svg @@ -68,12 +68,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627417" - inkscape:cx="243.38189" - inkscape:cy="179.44847" + inkscape:zoom="5.6568542" + inkscape:cx="210.79793" + inkscape:cy="172.46113" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:window-width="1280" inkscape:window-height="752" inkscape:window-x="4" @@ -793,38 +793,5 @@ width="20" id="rect5035" style="color:#000000;fill:#f8f8f8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - - - - diff --git a/src/prose/views/app.js b/src/prose/views/app.js index de56a7bf2..796ea473c 100644 --- a/src/prose/views/app.js +++ b/src/prose/views/app.js @@ -191,7 +191,7 @@ module.exports = Backbone.View.extend({ .removeClass('error'); $('#prose') - .removeClass('error, saving, saved') + .removeClass('error saving saved save') .addClass('save'); } }, @@ -199,7 +199,7 @@ module.exports = Backbone.View.extend({ updateSaveState: function(label, classes) { $('.button.save', this.el).html(label); $('#prose') - .removeClass('error, saving, saved') + .removeClass('error saving saved save') .addClass(classes); }, diff --git a/templates/heading.html b/templates/heading.html index 83c1158f1..3ceba6fae 100644 --- a/templates/heading.html +++ b/templates/heading.html @@ -1,5 +1,6 @@ <% if (alterable) { %> -
+
+ <%= avatar %>