From 53a24b64b92f2186f12579dbaf6bd1130abcea2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adriano=20Cahet=C3=A9?= Date: Fri, 4 Sep 2015 20:06:37 -0300 Subject: [PATCH 1/3] Remove unnecessary space in admin panels + Fix statistic table layout + Fix scrollbar showing just when it's necessary --- client/stylesheets/base.less | 23 +++++--- .../.npm/package/npm-shrinkwrap.json | 52 +++++++++---------- .../.npm/package/npm-shrinkwrap.json | 14 ++--- .../.npm/package/npm-shrinkwrap.json | 32 ++++++------ 4 files changed, 66 insertions(+), 55 deletions(-) diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less index 87fc926536940..7fae725105769 100644 --- a/client/stylesheets/base.less +++ b/client/stylesheets/base.less @@ -255,7 +255,7 @@ blockquote { .rocket-form { max-width: 620px; width: 90%; - padding: 25px 0; + //padding: 25px 0; legend { margin-bottom: 23px; position: relative; @@ -1326,7 +1326,7 @@ a.github-fork { ~"100% - " @header-min-height + @footer-min-height); width: 100%; overflow-x: hidden; - overflow-y: scroll; + overflow-y: auto; display: block; -webkit-overflow-scrolling: touch; box-shadow: 0 0 5px rgba(0, 0, 0, 0.4) inset; @@ -1720,10 +1720,9 @@ a.github-fork { overflow-y: hidden; .content { &:extend(.fill-all); - padding: 0px 40px; + padding: 25px 40px 0px; overflow-y: scroll; margin-top: 60px; - padding-top: 15px; -webkit-overflow-scrolling: touch; .calc(height, ~'100% - 60px'); @@ -1934,6 +1933,11 @@ a.github-fork { padding: 0 0 0 10px; font-weight: 500; } + + &:first-of-type > h1 { + margin-top: 0px; + } + .section-content { border: 1px solid #ddd; padding: 20px; @@ -3760,9 +3764,16 @@ a.github-fork { } .statistics-table { - border: 1px solid black; + border: 1px solid #F9F9F9; + width:100%; + tr { + background-color:#FFFFFF; + + &:nth-of-type(even) { + background-color:#FBFBFB; + } + } th, td { - border: 1px solid black; text-align: left; padding: 3px 10px; } diff --git a/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json b/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json index 4f676a0acb40d..0f8bf2b7ad4d6 100644 --- a/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json +++ b/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json @@ -1,94 +1,94 @@ { "dependencies": { "connect": { - "version": "2.7.10", + "version": "http://registry.npmjs.org/connect/-/connect-2.7.10.tgz", "dependencies": { "qs": { - "version": "0.6.5" + "version": "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz" }, "formidable": { - "version": "1.0.14" + "version": "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz" }, "cookie-signature": { - "version": "1.0.1" + "version": "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz" }, "buffer-crc32": { - "version": "0.2.1" + "version": "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz" }, "cookie": { - "version": "0.0.5" + "version": "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz" }, "send": { - "version": "0.1.0", + "version": "http://registry.npmjs.org/send/-/send-0.1.0.tgz", "dependencies": { "mime": { - "version": "1.2.6" + "version": "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz" }, "range-parser": { - "version": "0.0.4" + "version": "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz" } } }, "bytes": { - "version": "0.2.0" + "version": "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz" }, "fresh": { - "version": "0.1.0" + "version": "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz" }, "pause": { - "version": "0.0.1" + "version": "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz" }, "debug": { - "version": "2.2.0", + "version": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "dependencies": { "ms": { - "version": "0.7.1" + "version": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz" } } } } }, "querystring": { - "version": "0.2.0" + "version": "http://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" }, "xml-crypto": { - "version": "0.6.0", + "version": "http://registry.npmjs.org/xml-crypto/-/xml-crypto-0.6.0.tgz", "dependencies": { "xpath.js": { - "version": "1.0.6" + "version": "http://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz" } } }, "xml-encryption": { - "version": "0.7.2", + "version": "http://registry.npmjs.org/xml-encryption/-/xml-encryption-0.7.2.tgz", "dependencies": { "ejs": { - "version": "0.8.8" + "version": "http://registry.npmjs.org/ejs/-/ejs-0.8.8.tgz" }, "async": { - "version": "0.2.10" + "version": "http://registry.npmjs.org/async/-/async-0.2.10.tgz" }, "xpath": { - "version": "0.0.5" + "version": "http://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz" }, "node-forge": { - "version": "0.2.24" + "version": "http://registry.npmjs.org/node-forge/-/node-forge-0.2.24.tgz" } } }, "xml2js": { - "version": "0.2.0", + "version": "http://registry.npmjs.org/xml2js/-/xml2js-0.2.0.tgz", "dependencies": { "sax": { - "version": "1.1.2" + "version": "http://registry.npmjs.org/sax/-/sax-1.1.2.tgz" } } }, "xmlbuilder": { - "version": "2.6.4", + "version": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz", "dependencies": { "lodash": { - "version": "3.10.1" + "version": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" } } }, diff --git a/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json index bf4b8acb16e72..a8ecae95ec9c2 100644 --- a/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json @@ -1,29 +1,29 @@ { "dependencies": { "gm": { - "version": "1.18.1", + "version": "http://registry.npmjs.org/gm/-/gm-1.18.1.tgz", "dependencies": { "debug": { - "version": "2.2.0", + "version": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "dependencies": { "ms": { - "version": "0.7.1" + "version": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz" } } }, "array-series": { - "version": "0.1.5" + "version": "http://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz" }, "array-parallel": { - "version": "0.1.3" + "version": "http://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz" } } }, "gridfs-stream": { - "version": "0.5.3" + "version": "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.3.tgz" }, "mkdirp": { - "version": "0.3.5" + "version": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" } } } diff --git a/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json index 3dd543e2c5edc..db1eb39703a3d 100644 --- a/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json @@ -1,58 +1,58 @@ { "dependencies": { "ldapjs": { - "version": "0.7.1", + "version": "http://registry.npmjs.org/ldapjs/-/ldapjs-0.7.1.tgz", "dependencies": { "asn1": { - "version": "0.2.1" + "version": "http://registry.npmjs.org/asn1/-/asn1-0.2.1.tgz" }, "assert-plus": { - "version": "0.1.5" + "version": "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" }, "bunyan": { - "version": "0.22.1", + "version": "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz", "dependencies": { "mv": { - "version": "0.0.5" + "version": "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz" } } }, "nopt": { - "version": "2.1.1", + "version": "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz", "dependencies": { "abbrev": { - "version": "1.0.7" + "version": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" } } }, "pooling": { - "version": "0.4.6", + "version": "http://registry.npmjs.org/pooling/-/pooling-0.4.6.tgz", "dependencies": { "once": { - "version": "1.3.0" + "version": "http://registry.npmjs.org/once/-/once-1.3.0.tgz" }, "vasync": { - "version": "1.4.0", + "version": "http://registry.npmjs.org/vasync/-/vasync-1.4.0.tgz", "dependencies": { "jsprim": { - "version": "0.3.0", + "version": "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz", "dependencies": { "extsprintf": { - "version": "1.0.0" + "version": "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz" }, "json-schema": { - "version": "0.2.2" + "version": "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" }, "verror": { - "version": "1.3.3" + "version": "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz" } } }, "verror": { - "version": "1.1.0", + "version": "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz", "dependencies": { "extsprintf": { - "version": "1.0.0" + "version": "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz" } } } From d82397dbe28e87f517eda7864089355f993cd526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adriano=20Cahet=C3=A9?= Date: Fri, 4 Sep 2015 20:12:40 -0300 Subject: [PATCH 2/3] Remove unnecessary space in admin panels + Fix statistic table layout + Fix scrollbar showing just when it's necessary --- client/stylesheets/base.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less index 7fae725105769..0806f62f7e144 100644 --- a/client/stylesheets/base.less +++ b/client/stylesheets/base.less @@ -1996,6 +1996,7 @@ a.github-fork { text-transform: uppercase; } } + .list { a { .clearfix; @@ -2038,8 +2039,7 @@ a.github-fork { .info { display: block; float: left; - .calc(width, - ~"100% - 150px"); + .calc(width,~"100% - 150px"); i { margin-right: 5px; width: 20px; From c33b1358784872d77eb13e9965fcdbbafdf74986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adriano=20Cahet=C3=A9?= Date: Sat, 5 Sep 2015 02:55:07 -0300 Subject: [PATCH 3/3] Fixing last commit --- client/stylesheets/base.less | 2 +- .../.npm/package/npm-shrinkwrap.json | 52 +++++++++---------- .../.npm/package/npm-shrinkwrap.json | 16 +++--- .../.npm/package/npm-shrinkwrap.json | 32 ++++++------ 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less index 0806f62f7e144..7624c1e8cba4a 100644 --- a/client/stylesheets/base.less +++ b/client/stylesheets/base.less @@ -255,7 +255,7 @@ blockquote { .rocket-form { max-width: 620px; width: 90%; - //padding: 25px 0; + legend { margin-bottom: 23px; position: relative; diff --git a/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json b/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json index 0f8bf2b7ad4d6..4f676a0acb40d 100644 --- a/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json +++ b/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json @@ -1,94 +1,94 @@ { "dependencies": { "connect": { - "version": "http://registry.npmjs.org/connect/-/connect-2.7.10.tgz", + "version": "2.7.10", "dependencies": { "qs": { - "version": "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz" + "version": "0.6.5" }, "formidable": { - "version": "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz" + "version": "1.0.14" }, "cookie-signature": { - "version": "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz" + "version": "1.0.1" }, "buffer-crc32": { - "version": "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz" + "version": "0.2.1" }, "cookie": { - "version": "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz" + "version": "0.0.5" }, "send": { - "version": "http://registry.npmjs.org/send/-/send-0.1.0.tgz", + "version": "0.1.0", "dependencies": { "mime": { - "version": "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz" + "version": "1.2.6" }, "range-parser": { - "version": "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz" + "version": "0.0.4" } } }, "bytes": { - "version": "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz" + "version": "0.2.0" }, "fresh": { - "version": "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz" + "version": "0.1.0" }, "pause": { - "version": "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz" + "version": "0.0.1" }, "debug": { - "version": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.2.0", "dependencies": { "ms": { - "version": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.1" } } } } }, "querystring": { - "version": "http://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" + "version": "0.2.0" }, "xml-crypto": { - "version": "http://registry.npmjs.org/xml-crypto/-/xml-crypto-0.6.0.tgz", + "version": "0.6.0", "dependencies": { "xpath.js": { - "version": "http://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz" + "version": "1.0.6" } } }, "xml-encryption": { - "version": "http://registry.npmjs.org/xml-encryption/-/xml-encryption-0.7.2.tgz", + "version": "0.7.2", "dependencies": { "ejs": { - "version": "http://registry.npmjs.org/ejs/-/ejs-0.8.8.tgz" + "version": "0.8.8" }, "async": { - "version": "http://registry.npmjs.org/async/-/async-0.2.10.tgz" + "version": "0.2.10" }, "xpath": { - "version": "http://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz" + "version": "0.0.5" }, "node-forge": { - "version": "http://registry.npmjs.org/node-forge/-/node-forge-0.2.24.tgz" + "version": "0.2.24" } } }, "xml2js": { - "version": "http://registry.npmjs.org/xml2js/-/xml2js-0.2.0.tgz", + "version": "0.2.0", "dependencies": { "sax": { - "version": "http://registry.npmjs.org/sax/-/sax-1.1.2.tgz" + "version": "1.1.2" } } }, "xmlbuilder": { - "version": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz", + "version": "2.6.4", "dependencies": { "lodash": { - "version": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" + "version": "3.10.1" } } }, diff --git a/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json index a8ecae95ec9c2..2f3de1e5932b4 100644 --- a/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json @@ -1,29 +1,29 @@ { "dependencies": { "gm": { - "version": "http://registry.npmjs.org/gm/-/gm-1.18.1.tgz", + "version": "1.18.1", "dependencies": { "debug": { - "version": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "version": "2.2.0", "dependencies": { "ms": { - "version": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + "version": "0.7.1" } } }, "array-series": { - "version": "http://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz" + "version": "0.1.5" }, "array-parallel": { - "version": "http://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz" + "version": "0.1.3" } } }, "gridfs-stream": { - "version": "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.3.tgz" + "version": "0.5.3" }, "mkdirp": { - "version": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "version": "0.3.5" } } -} +} \ No newline at end of file diff --git a/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json index db1eb39703a3d..3dd543e2c5edc 100644 --- a/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json @@ -1,58 +1,58 @@ { "dependencies": { "ldapjs": { - "version": "http://registry.npmjs.org/ldapjs/-/ldapjs-0.7.1.tgz", + "version": "0.7.1", "dependencies": { "asn1": { - "version": "http://registry.npmjs.org/asn1/-/asn1-0.2.1.tgz" + "version": "0.2.1" }, "assert-plus": { - "version": "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" + "version": "0.1.5" }, "bunyan": { - "version": "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz", + "version": "0.22.1", "dependencies": { "mv": { - "version": "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz" + "version": "0.0.5" } } }, "nopt": { - "version": "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz", + "version": "2.1.1", "dependencies": { "abbrev": { - "version": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" + "version": "1.0.7" } } }, "pooling": { - "version": "http://registry.npmjs.org/pooling/-/pooling-0.4.6.tgz", + "version": "0.4.6", "dependencies": { "once": { - "version": "http://registry.npmjs.org/once/-/once-1.3.0.tgz" + "version": "1.3.0" }, "vasync": { - "version": "http://registry.npmjs.org/vasync/-/vasync-1.4.0.tgz", + "version": "1.4.0", "dependencies": { "jsprim": { - "version": "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz", + "version": "0.3.0", "dependencies": { "extsprintf": { - "version": "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz" + "version": "1.0.0" }, "json-schema": { - "version": "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" + "version": "0.2.2" }, "verror": { - "version": "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz" + "version": "1.3.3" } } }, "verror": { - "version": "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz", + "version": "1.1.0", "dependencies": { "extsprintf": { - "version": "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz" + "version": "1.0.0" } } }