From d7e81b03e50f2e102ce4ba68b19857141f94907d Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Thu, 20 Jun 2013 11:21:51 -0400 Subject: [PATCH] updates to feed when fixing pagination Former-commit-id: 0fc90715e20dc17feb94982de66f4c81d6f5d110 Former-commit-id: f6e6ed6a6155f98f771b4ca2bf4959639d60fdd2 --- build/minified/views/feed.min.css | 2 +- build/packaged/semantic.min.css.REMOVED.git-id | 2 +- build/packaged/semantic.min.js.REMOVED.git-id | 2 +- build/uncompressed/views/feed.css | 14 ++++++++++---- .../src/files/components/semantic/views/feed.css | 14 ++++++++++---- src/views/feed.less | 16 +++++++++++----- 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/build/minified/views/feed.min.css b/build/minified/views/feed.min.css index 89a110bb2..be000964e 100644 --- a/build/minified/views/feed.min.css +++ b/build/minified/views/feed.min.css @@ -1 +1 @@ -.ui.feed a{cursor:pointer}.ui.feed .event{width:100%;display:table;padding:1em;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.feed .event:first-child{border-top:0}.ui.feed .event:last-child{margin-bottom:1em}.ui.feed .label{width:3em;display:table-cell;vertical-align:top;text-align:left}.ui.feed .label .icon{font-size:1.5em;margin:0}.ui.feed .label img{width:3em;margin:0;border-radius:50em}.ui.feed .label+.content{padding:.75em 1em 0}.ui.feed .content{display:table-cell;vertical-align:top;text-align:left}.ui.feed .content .date{float:right;padding-left:1em;color:rgba(0,0,0,.4)}.ui.feed .content .summary{color:rgba(0,0,0,.75)}.ui.feed .content .summary img{display:inline-block;margin-right:.25em;width:4em;border-radius:500px}.ui.feed .content .extra{margin:1em 0 0;padding:.5em 0 0;color:rgba(0,0,0,.5)}.ui.feed .content .extra.images img{display:inline-block;margin-right:.25em;width:6em}.ui.feed .content .extra.text{padding:.5em 1em;border-left:.2em solid rgba(0,0,0,.1)}.ui.small.feed .label img{width:2.5em}.ui.small.feed .label .icon{font-size:1.25em}.ui.feed .event{padding:.75em 0}.ui.small.feed .label+.content{padding:.5em .5em 0}.ui.small.feed .content .extra.images img{width:5em}.ui.small.feed .content .extra{margin:.5em 0 0}.ui.small.feed .content .extra.text{padding:.25em .5em} \ No newline at end of file +.ui.feed a{cursor:pointer}.ui.feed,.ui.feed .event,.ui.feed .label,.ui.feed .content,.ui.feed .extra{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.feed .event{width:100%;display:table;padding:1em}.ui.feed .event:first-child{border-top:0}.ui.feed .event:last-child{margin-bottom:1em}.ui.feed .label{width:3em;display:table-cell;vertical-align:top;text-align:left}.ui.feed .label .icon{font-size:1.5em;margin:0}.ui.feed .label img{width:3em;margin:0;border-radius:50em}.ui.feed .label+.content{padding:.75em 1em 0}.ui.feed .content{display:table-cell;vertical-align:top;text-align:left}.ui.feed .content .date{float:right;padding-left:1em;color:rgba(0,0,0,.4)}.ui.feed .content .summary{color:rgba(0,0,0,.75)}.ui.feed .content .summary img{display:inline-block;margin-right:.25em;width:4em;border-radius:500px}.ui.feed .content .extra{margin:1em 0 0;padding:.5em 0 0;color:rgba(0,0,0,.5)}.ui.feed .content .extra.images img{display:inline-block;margin-right:.25em;width:6em}.ui.feed .content .extra.text{padding:.5em 1em;border-left:.2em solid rgba(0,0,0,.1)}.ui.small.feed .label img{width:2.5em}.ui.small.feed .label .icon{font-size:1.25em}.ui.feed .event{padding:.75em 0}.ui.small.feed .label+.content{padding:.5em .5em 0}.ui.small.feed .content .extra.images img{width:5em}.ui.small.feed .content .extra{margin:.5em 0 0}.ui.small.feed .content .extra.text{padding:.25em .5em} \ No newline at end of file diff --git a/build/packaged/semantic.min.css.REMOVED.git-id b/build/packaged/semantic.min.css.REMOVED.git-id index 3f47fd7d3..a5abe35df 100644 --- a/build/packaged/semantic.min.css.REMOVED.git-id +++ b/build/packaged/semantic.min.css.REMOVED.git-id @@ -1 +1 @@ -2ffca933a357fce70e59c4efaca15de959392db8 \ No newline at end of file +e0892136277a98be7b91ef47f8bb396a1160da05 \ No newline at end of file diff --git a/build/packaged/semantic.min.js.REMOVED.git-id b/build/packaged/semantic.min.js.REMOVED.git-id index da753a8e4..c00c0e1d2 100644 --- a/build/packaged/semantic.min.js.REMOVED.git-id +++ b/build/packaged/semantic.min.js.REMOVED.git-id @@ -1 +1 @@ -5d1fee64a033330c075a347a2d643b7e80563cc5 \ No newline at end of file +25f9fbb466c35c5d2e9398dbddb9bd125f306b51 \ No newline at end of file diff --git a/build/uncompressed/views/feed.css b/build/uncompressed/views/feed.css index 3d4b86984..b6cc05d1a 100644 --- a/build/uncompressed/views/feed.css +++ b/build/uncompressed/views/feed.css @@ -15,6 +15,16 @@ .ui.feed a { cursor: pointer; } +.ui.feed, +.ui.feed .event, +.ui.feed .label, +.ui.feed .content, +.ui.feed .extra { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} /******************************* Content *******************************/ @@ -23,10 +33,6 @@ width: 100%; display: table; padding: 1em; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .ui.feed .event:first-child { border-top: 0px; diff --git a/node/src/files/components/semantic/views/feed.css b/node/src/files/components/semantic/views/feed.css index 3d4b86984..b6cc05d1a 100644 --- a/node/src/files/components/semantic/views/feed.css +++ b/node/src/files/components/semantic/views/feed.css @@ -15,6 +15,16 @@ .ui.feed a { cursor: pointer; } +.ui.feed, +.ui.feed .event, +.ui.feed .label, +.ui.feed .content, +.ui.feed .extra { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} /******************************* Content *******************************/ @@ -23,10 +33,6 @@ width: 100%; display: table; padding: 1em; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .ui.feed .event:first-child { border-top: 0px; diff --git a/src/views/feed.less b/src/views/feed.less index 24104532b..5f288cfde 100755 --- a/src/views/feed.less +++ b/src/views/feed.less @@ -23,6 +23,17 @@ cursor: pointer; } +.ui.feed, +.ui.feed .event, +.ui.feed .label, +.ui.feed .content, +.ui.feed .extra { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} + /******************************* Content @@ -33,11 +44,6 @@ width: 100%; display: table; padding: 1em; - - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .ui.feed .event:first-child { border-top: 0px;