From 0927af40c36083f95c5833971e07646f63d073cc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 13 Dec 2016 11:14:22 +0100 Subject: bring lockview to wikilist --- view/css/mod_wiki.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'view/css') diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index 83f17c820..49eb89ecc 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -38,13 +38,13 @@ padding: 7px 3px 7px 10px; } -#wikis-index th:nth-child(3), -#wikis-index td:nth-child(3){ +#wikis-index th:nth-child(4), +#wikis-index td:nth-child(4){ padding: 7px 10px 7px 7px; } -#wikis-index th:nth-child(4), -#wikis-index td:nth-child(4){ +#wikis-index th:nth-child(5), +#wikis-index td:nth-child(5){ padding: 7px 10px 7px 7px; } -- cgit v1.2.3 From b24b3d21e1d4999e03d4e268261bd190c6d02441 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 13 Dec 2016 11:24:03 +0100 Subject: dropdown position fixes --- view/css/bootstrap-red.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'view/css') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index b68517e25..cea911440 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -60,8 +60,7 @@ aside .nav-pills > li > a, padding: 6px 10px; } -.wall-item-tools .dropdown-menu, -.section-title-wrapper .dropdown-menu { +.wall-item-tools .dropdown-menu { min-width: auto; } -- cgit v1.2.3 From e2f1ce775860b1bb1ce23b9229d85aed4c748aea Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 15 Dec 2016 14:49:14 +0100 Subject: note widget: whitespace and resize the textarea to reveal full content --- view/css/widgets.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/css') diff --git a/view/css/widgets.css b/view/css/widgets.css index 402c3f473..abaf03038 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -65,7 +65,7 @@ li:hover .widget-nav-pills-icons { padding: 5px; width: 100%; resize: vertical; - height: 250px; + min-height: 250px; } /* saved searches */ -- cgit v1.2.3 From 493aa9f20d3a48132a83b1da0c643f80c038e617 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 20 Dec 2016 18:43:20 -0800 Subject: progress on abook_vcard --- view/css/mod_connedit.css | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) (limited to 'view/css') diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index 87eff66d4..176554ed9 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -16,3 +16,108 @@ #perms-tool-table td { vertical-align: top; } + + +.vcard-header { + cursor: pointer; + padding: 7px 10px; + margin-bottom: 3px; +} + +.vcard-header:hover, +.vcard-header.active { + background-color: rgb(238,238,238); + cursor: pointer; +} + +.vcard-header.active:hover { + cursor: initial; +} + +.vcard-add-field { + margin-top: 8px; + display: none; +} + +.vcard-cancel { + margin: 6px 10px; + height: 32px; + line-height: 32px; + color: #777; + font-size: 16px; + + cursor: pointer; + display: none; + float: right; +} + +.vcard-info { + display: none; +} + +.vcard-nophoto { + display: inline-block; + width: 32px; + height: 32px; + border-radius: 4px; + border: 1px solid #ccc; + text-align: center; + font-size: 20px; + color: #fff; + background-color: #ddd; +} + +.vcard-photo { + width: 32px; + height: 32px; + border-radius: 4px; + border: 1px solid #ccc; + text-align: center; +} + +.vcard-fn-preview, +input.vcard-fn { + font-size: 16px !important; + margin-left: 5px; +} + +.vcard-email-preview, +.vcard-tel-preview { + color: #999; +} + + +.vcard-fn, +#create_form, +#more_block { + display: none; +} + +input.vcard-fn, +.vcard-fn-create input, +.vcard-org input, +.vcard-title input, +.vcard-tel input, +.vcard-email input, +.vcard-impp input, +.vcard-url input, +.vcard-adr input, +.vcard-note input { + padding: 0px; + margin-left: 5px; + border-width: 0px 0px 1px 0px; + border-radius: 0px; + background-color: transparent; + min-width: 160px; +} + +#template-form-vcard-org, +#template-form-vcard-title, +#template-form-vcard-tel, +#template-form-vcard-email, +#template-form-vcard-impp, +#template-form-vcard-url, +#template-form-vcard-adr, +#template-form-vcard-note { + display: none; +} -- cgit v1.2.3 From f3ec818a66e7909bcb744868cfef43c3481c4e43 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 20 Dec 2016 20:37:06 -0800 Subject: abook_vcard cleanup --- view/css/mod_connedit.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/css') diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index 176554ed9..a6f6a3818 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -121,3 +121,8 @@ input.vcard-fn, #template-form-vcard-note { display: none; } + +.connphone { + font-size: 150%; + color: green; +} \ No newline at end of file -- cgit v1.2.3 From 3d811a17feb9b3d0fd4dc09023e3b7b5fe1623ac Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 20 Dec 2016 23:26:31 -0800 Subject: provide call button on connections list if mobile|tablet and a phone number exists --- view/css/mod_connections.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/css') diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index a33430e48..00e6e2a70 100644 --- a/view/css/mod_connections.css +++ b/view/css/mod_connections.css @@ -33,3 +33,7 @@ .contact-info-label { font-weight: bold; } + +.connphone { + color: green; +} \ No newline at end of file -- cgit v1.2.3 From 04472bd730f464aaee1ef79cf67c8b4f79f85652 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 21 Dec 2016 11:51:24 +0100 Subject: fix a glitch in sticky-kit and comment out alt_pager() in widget_conversations since it will not work there --- view/css/widgets.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'view/css') diff --git a/view/css/widgets.css b/view/css/widgets.css index abaf03038..fcce30529 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -1,6 +1,5 @@ .widget { - margin-bottom: 10px; - padding: 10px; + padding: 10px 10px 20px 10px; } .widget h3 { -- cgit v1.2.3 From fcc92299ebaf5a723f31e44e2e16a6248bbdc04b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 21 Dec 2016 12:55:49 +0100 Subject: css fixes --- view/css/widgets.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/css') diff --git a/view/css/widgets.css b/view/css/widgets.css index fcce30529..abaf03038 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -1,5 +1,6 @@ .widget { - padding: 10px 10px 20px 10px; + margin-bottom: 10px; + padding: 10px; } .widget h3 { -- cgit v1.2.3 From bb85e139f110d2d65a54f8aefbd3777a99d053e2 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 21 Dec 2016 15:03:33 -0800 Subject: more vcard work --- view/css/mod_connedit.css | 1 - 1 file changed, 1 deletion(-) (limited to 'view/css') diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index a6f6a3818..f1784721e 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -123,6 +123,5 @@ input.vcard-fn, } .connphone { - font-size: 150%; color: green; } \ No newline at end of file -- cgit v1.2.3 From 2ce6d47519e4f8d2b24c721a812c8826ac9c1c7a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 22 Dec 2016 11:54:04 +0100 Subject: more robust crossbrowser support --- view/css/default.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/css') diff --git a/view/css/default.css b/view/css/default.css index db0628cb3..67a411d6e 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -15,12 +15,14 @@ main { } aside { + position: relative; display: table-cell; vertical-align: top; padding: 71px 7px 0px 7px; } section { + position: relative; width: 100%; display: table-cell; vertical-align: top; -- cgit v1.2.3 From 3629468d475230b68a1dc01b2888371716aa8364 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 22 Dec 2016 15:20:02 +0100 Subject: move style info into css file --- view/css/mod_help.css | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 view/css/mod_help.css (limited to 'view/css') diff --git a/view/css/mod_help.css b/view/css/mod_help.css new file mode 100644 index 000000000..f59a40894 --- /dev/null +++ b/view/css/mod_help.css @@ -0,0 +1,29 @@ +.doco-list-group-item > a { + font-weight: bold; +} + +.sub-menu { + margin: 3px 0px 10px 10px; +} + +#doco-content h3 { + border-bottom: #ccc 3px solid; + padding-bottom: 0.3em; +} + +#doco-content h4 { + text-decoration: underline; +} + +#doco-content h5 { + text-decoration: underline; +} + +#region_1 .widget ul ul { + list-style-type: none; +} + +.toc-content li, + #doco-top-toc li { + padding: 3px 0px; +} -- cgit v1.2.3 From 8a074dedb6ded00589ea9890fd6b40789cf920ce Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 30 Dec 2016 13:35:43 +0100 Subject: css fixes and get rid of a javascript workaround --- view/css/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/css') diff --git a/view/css/default.css b/view/css/default.css index 67a411d6e..d9bea7b41 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -10,8 +10,8 @@ main { display: table; table-layout: fixed; position: relative; - width: 100%; - height: 100%; + width: 100vw; + height: 100vh; } aside { -- cgit v1.2.3 From 9831b358f823e688c924ace7af97c10283e4dcae Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 1 Jan 2017 13:29:27 -0800 Subject: profile vcard - preliminary work --- view/css/mod_profile.css | 108 ++++++++++++++++++++++++++++++++++++++++++++++ view/css/mod_profiles.css | 107 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 215 insertions(+) (limited to 'view/css') diff --git a/view/css/mod_profile.css b/view/css/mod_profile.css index 35016d10b..6591f8a57 100644 --- a/view/css/mod_profile.css +++ b/view/css/mod_profile.css @@ -5,3 +5,111 @@ .profile-thing-img { margin: 7px 0px; } + +.vcard-header { + cursor: pointer; + padding: 7px 10px; + margin-bottom: 3px; +} + +.vcard-header:hover, +.vcard-header.active { + background-color: rgb(238,238,238); + cursor: pointer; +} + +.vcard-header.active:hover { + cursor: initial; +} + +.vcard-add-field { + margin-top: 8px; + display: none; +} + +.vcard-cancel { + margin: 6px 10px; + height: 32px; + line-height: 32px; + color: #777; + font-size: 16px; + + cursor: pointer; + display: none; + float: right; +} + +.vcard-info { + display: none; +} + +.vcard-nophoto { + display: inline-block; + width: 32px; + height: 32px; + border-radius: 4px; + border: 1px solid #ccc; + text-align: center; + font-size: 20px; + color: #fff; + background-color: #ddd; +} + +.vcard-photo { + width: 32px; + height: 32px; + border-radius: 4px; + border: 1px solid #ccc; + text-align: center; +} + +.vcard-fn-preview, +input.vcard-fn { + font-size: 16px !important; + margin-left: 5px; +} + +.vcard-email-preview, +.vcard-tel-preview { + color: #999; +} + + +.vcard-fn, +#create_form, +#more_block { + display: none; +} + +input.vcard-fn, +.vcard-fn-create input, +.vcard-org input, +.vcard-title input, +.vcard-tel input, +.vcard-email input, +.vcard-impp input, +.vcard-url input, +.vcard-adr input, +.vcard-note input { + padding: 0px; + margin-left: 5px; + border-width: 0px 0px 1px 0px; + border-radius: 0px; + background-color: transparent; + min-width: 160px; +} + +#template-form-vcard-org, +#template-form-vcard-title, +#template-form-vcard-tel, +#template-form-vcard-email, +#template-form-vcard-impp, +#template-form-vcard-url, +#template-form-vcard-adr, +#template-form-vcard-note { + display: none; +} + +.connphone { + color: green; +} diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css index 4d83e6419..bd2a449ed 100644 --- a/view/css/mod_profiles.css +++ b/view/css/mod_profiles.css @@ -29,3 +29,110 @@ height: 48px; margin: 10px 0px; } +.vcard-header { + cursor: pointer; + padding: 7px 10px; + margin-bottom: 3px; +} + +.vcard-header:hover, +.vcard-header.active { + background-color: rgb(238,238,238); + cursor: pointer; +} + +.vcard-header.active:hover { + cursor: initial; +} + +.vcard-add-field { + margin-top: 8px; + display: none; +} + +.vcard-cancel { + margin: 6px 10px; + height: 32px; + line-height: 32px; + color: #777; + font-size: 16px; + + cursor: pointer; + display: none; + float: right; +} + +.vcard-info { + display: none; +} + +.vcard-nophoto { + display: inline-block; + width: 32px; + height: 32px; + border-radius: 4px; + border: 1px solid #ccc; + text-align: center; + font-size: 20px; + color: #fff; + background-color: #ddd; +} + +.vcard-photo { + width: 32px; + height: 32px; + border-radius: 4px; + border: 1px solid #ccc; + text-align: center; +} + +.vcard-fn-preview, +input.vcard-fn { + font-size: 16px !important; + margin-left: 5px; +} + +.vcard-email-preview, +.vcard-tel-preview { + color: #999; +} + + +.vcard-fn, +#create_form, +#more_block { + display: none; +} + +input.vcard-fn, +.vcard-fn-create input, +.vcard-org input, +.vcard-title input, +.vcard-tel input, +.vcard-email input, +.vcard-impp input, +.vcard-url input, +.vcard-adr input, +.vcard-note input { + padding: 0px; + margin-left: 5px; + border-width: 0px 0px 1px 0px; + border-radius: 0px; + background-color: transparent; + min-width: 160px; +} + +#template-form-vcard-org, +#template-form-vcard-title, +#template-form-vcard-tel, +#template-form-vcard-email, +#template-form-vcard-impp, +#template-form-vcard-url, +#template-form-vcard-adr, +#template-form-vcard-note { + display: none; +} + +.connphone { + color: green; +} \ No newline at end of file -- cgit v1.2.3 From a1b35fb7d13c610ac6923e6162dd163312160c9a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 5 Jan 2017 17:40:45 +0100 Subject: fix an issue with sticky_kit where input fields and textareas would blur on recalc. auto resize the notes textarea since if it sticks to the bottom it can not be properly resized --- view/css/widgets.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/css') diff --git a/view/css/widgets.css b/view/css/widgets.css index abaf03038..9b97d8bf7 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -64,8 +64,9 @@ li:hover .widget-nav-pills-icons { #note-text { padding: 5px; width: 100%; - resize: vertical; + resize: none; min-height: 250px; + overflow: hidden; } /* saved searches */ -- cgit v1.2.3 From d1493e6b7046b189656a81b3fdd73ee633359206 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 7 Jan 2017 10:07:05 +0100 Subject: fix main width if right aside is hidden --- view/css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/css') diff --git a/view/css/default.css b/view/css/default.css index d9bea7b41..a51461201 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -10,7 +10,7 @@ main { display: table; table-layout: fixed; position: relative; - width: 100vw; + width: 100%; height: 100vh; } -- cgit v1.2.3 From 76daa03df075bd3350102f0984b24f5ef1ff876a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 11 Jan 2017 22:16:02 +0100 Subject: comment out redundant querys --- view/css/mod_connedit.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/css') diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index f1784721e..67a182c5c 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -124,4 +124,4 @@ input.vcard-fn, .connphone { color: green; -} \ No newline at end of file +} -- cgit v1.2.3 From dfafa81bfe23da475248ebb2bbf57851acf630bc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 23 Jan 2017 17:10:52 +0100 Subject: give apps a bit more horizontal space --- view/css/mod_apps.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/css') diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css index cfaf5ef87..7ccc11ffb 100644 --- a/view/css/mod_apps.css +++ b/view/css/mod_apps.css @@ -1,6 +1,6 @@ .app-container { float: left; - width: 125px; + width: 150px; height: 180px; padding: 20px; } -- cgit v1.2.3 From b4aaa1953c43259e022f80bb68b6c65e10ef92c4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Jan 2017 11:24:15 +0100 Subject: fix wiki list template --- view/css/mod_wiki.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'view/css') diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index 49eb89ecc..83f17c820 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -38,13 +38,13 @@ padding: 7px 3px 7px 10px; } -#wikis-index th:nth-child(4), -#wikis-index td:nth-child(4){ +#wikis-index th:nth-child(3), +#wikis-index td:nth-child(3){ padding: 7px 10px 7px 7px; } -#wikis-index th:nth-child(5), -#wikis-index td:nth-child(5){ +#wikis-index th:nth-child(4), +#wikis-index td:nth-child(4){ padding: 7px 10px 7px 7px; } -- cgit v1.2.3 From cde7a3f66cd8d48f0c7aea2391a2778fe494f884 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 1 Feb 2017 12:52:19 +0100 Subject: more work on app-bin --- view/css/bootstrap-red.css | 8 -------- 1 file changed, 8 deletions(-) (limited to 'view/css') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index cea911440..6cc4a4238 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -44,14 +44,6 @@ nav .dropdown-menu { margin-top: 0px; } -nav .navbar-collapse .navbar-left { - float: left; -} - -nav .navbar-collapse .navbar-right { - float: right; -} - /* nav overrides end */ -- cgit v1.2.3 From 1a56045b42ffee538c20337a70e7ae4a8b62937d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 1 Feb 2017 13:08:41 +0100 Subject: nav dropdown-menu overrides --- view/css/bootstrap-red.css | 7 ------- 1 file changed, 7 deletions(-) (limited to 'view/css') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 6cc4a4238..e98065b2b 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -37,13 +37,6 @@ nav .navbar-header img { margin-top: 1px; } -nav .dropdown-menu { - max-height: 450px; - width: 270px; - overflow-y: auto; - margin-top: 0px; -} - /* nav overrides end */ -- cgit v1.2.3 From d476b7477b72557d127837be048098d24c82ae87 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 1 Feb 2017 22:24:37 +0100 Subject: fix notifications badge positioning and rendering of submenus in collapsed mode --- view/css/bootstrap-red.css | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'view/css') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index e98065b2b..b7310954a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -3,10 +3,8 @@ /* nav overrides */ nav .badge { - position: relative; - top: -49px; - left: 2px; - float: left; + margin-top: -30px; + margin-left: -30px; font-size: 10px; line-height: 20px; padding: 0px 5px; @@ -14,12 +12,7 @@ nav .badge { min-width: 20px; border-radius: 10px; cursor: pointer; -} - -@media screen and (max-width: 767px) { - nav .badge { - top: -46px; - } + display: inline-block !important; } #navbar-collapse-1 i, @@ -27,10 +20,6 @@ nav .badge { font-size: 14px; } -nav ul li { - max-height: 50px; -} - nav .navbar-header img { height: 49px; width: 49px; @@ -45,13 +34,12 @@ aside .nav-pills > li > a, padding: 6px 10px; } -.wall-item-tools .dropdown-menu { - min-width: auto; +nav .dropdown-menu { + margin-top: 0px; } -.dropdown-menu li a { - overflow: hidden; - text-overflow: ellipsis; +.wall-item-tools .dropdown-menu { + min-width: auto; } .nav-tabs.nav-justified > li { -- cgit v1.2.3 From 7ffa98118f01ed14fdd175cf45ad45e8639ab0af Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 2 Feb 2017 10:12:56 +0100 Subject: really fix badge positions --- view/css/bootstrap-red.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'view/css') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index b7310954a..39461ad32 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -3,16 +3,15 @@ /* nav overrides */ nav .badge { - margin-top: -30px; - margin-left: -30px; + position: absolute; + top: 1px; + left: 1px; font-size: 10px; line-height: 20px; padding: 0px 5px; height: 20px; min-width: 20px; border-radius: 10px; - cursor: pointer; - display: inline-block !important; } #navbar-collapse-1 i, -- cgit v1.2.3 From 852073fc68dd8263db24c9bc24a784676a545532 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 2 Feb 2017 10:33:23 +0100 Subject: dropdown menus should be restricted in height in normal view but not in collapsed view --- view/css/bootstrap-red.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/css') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 39461ad32..f1ebb204e 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -35,6 +35,13 @@ aside .nav-pills > li > a, nav .dropdown-menu { margin-top: 0px; + max-height: 70vh; + overflow: auto; +} + +nav .navbar-collapse.in .dropdown-menu { + max-height: none; + overflow: none; } .wall-item-tools .dropdown-menu { -- cgit v1.2.3 From 63e06578c46a104b377b196aec27c6409fe9baf1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 2 Feb 2017 14:19:23 +0100 Subject: use bootstrap dropdown for login --- view/css/mod_home.css | 11 +++-------- view/css/mod_login.css | 22 ++-------------------- 2 files changed, 5 insertions(+), 28 deletions(-) (limited to 'view/css') diff --git a/view/css/mod_home.css b/view/css/mod_home.css index d4cf37253..b6112eb38 100644 --- a/view/css/mod_home.css +++ b/view/css/mod_home.css @@ -1,15 +1,10 @@ .home-welcome { text-align: center; -} - -.generic-content-wrapper-styled { - margin-left: auto; - margin-right: auto; - max-width: 420px; - font-size: 1.1em; + margin-bottom: 50px; } #login-main { max-width: 400px; - margin-top: 50px; + margin-left: auto; + margin-right: auto; } diff --git a/view/css/mod_login.css b/view/css/mod_login.css index a086c50df..53ba9cb1d 100644 --- a/view/css/mod_login.css +++ b/view/css/mod_login.css @@ -1,23 +1,5 @@ -.generic-content-wrapper-styled { - margin-left: auto; - margin-right: auto; - max-width: 420px; - font-size: 1.1em; -} - #login-main { max-width: 400px; - margin-top: 50px; -} - -@media (min-width: 768px) and (max-width: 991px) { - #region_1 { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - #region_3 { - display: table-cell !important; - } + margin-left: auto; + margin-right: auto; } -- cgit v1.2.3 From e2ee565f05a43bb5fa461df3fd857dc27c8d9b67 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 2 Feb 2017 14:19:23 +0100 Subject: cherry-pick nav-login changes --- view/css/mod_home.css | 11 +++-------- view/css/mod_login.css | 22 ++-------------------- 2 files changed, 5 insertions(+), 28 deletions(-) (limited to 'view/css') diff --git a/view/css/mod_home.css b/view/css/mod_home.css index d4cf37253..b6112eb38 100644 --- a/view/css/mod_home.css +++ b/view/css/mod_home.css @@ -1,15 +1,10 @@ .home-welcome { text-align: center; -} - -.generic-content-wrapper-styled { - margin-left: auto; - margin-right: auto; - max-width: 420px; - font-size: 1.1em; + margin-bottom: 50px; } #login-main { max-width: 400px; - margin-top: 50px; + margin-left: auto; + margin-right: auto; } diff --git a/view/css/mod_login.css b/view/css/mod_login.css index a086c50df..53ba9cb1d 100644 --- a/view/css/mod_login.css +++ b/view/css/mod_login.css @@ -1,23 +1,5 @@ -.generic-content-wrapper-styled { - margin-left: auto; - margin-right: auto; - max-width: 420px; - font-size: 1.1em; -} - #login-main { max-width: 400px; - margin-top: 50px; -} - -@media (min-width: 768px) and (max-width: 991px) { - #region_1 { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - #region_3 { - display: table-cell !important; - } + margin-left: auto; + margin-right: auto; } -- cgit v1.2.3 From eb3685f5377be06615de66aba104aad6f4927495 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 5 Feb 2017 18:47:35 -0800 Subject: remove per-page login css (home, login); add support for alternative markdown mention format --- view/css/mod_home.css | 5 ----- view/css/mod_login.css | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 view/css/mod_login.css (limited to 'view/css') diff --git a/view/css/mod_home.css b/view/css/mod_home.css index b6112eb38..fa2b2b28d 100644 --- a/view/css/mod_home.css +++ b/view/css/mod_home.css @@ -3,8 +3,3 @@ margin-bottom: 50px; } -#login-main { - max-width: 400px; - margin-left: auto; - margin-right: auto; -} diff --git a/view/css/mod_login.css b/view/css/mod_login.css deleted file mode 100644 index 53ba9cb1d..000000000 --- a/view/css/mod_login.css +++ /dev/null @@ -1,5 +0,0 @@ -#login-main { - max-width: 400px; - margin-left: auto; - margin-right: auto; -} -- cgit v1.2.3 From 8059260c185aa267d15f2a7d9d0df0c21140ad69 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 6 Feb 2017 13:45:46 +0100 Subject: import system apps on initial load --- view/css/mod_apps.css | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'view/css') diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css index 7ccc11ffb..0a231bc84 100644 --- a/view/css/mod_apps.css +++ b/view/css/mod_apps.css @@ -5,12 +5,6 @@ padding: 20px; } -.app-detail { - height: 130px; - overflow-x: hidden; - overflow-y: hidden; -} - -.app-tools { - margin-bottom: 0; +.app-name { + margin: 10px 0px; } -- cgit v1.2.3