From 1b0bf90d13a9db0976fa3bcddf50e56e57d0185a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 16:41:44 -0700 Subject: first cut - straighten out the margins --- view/theme/redbasic/css/style.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1bfbd711..7ccee2a32 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -228,6 +228,12 @@ footer { margin-bottom: 15px; } +aside ul { + list-style-type: none; + margin: 0; + padding: 0; +} + /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; @@ -2059,7 +2065,7 @@ img.mail-list-sender-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; } - +/* .categories-ul { list-style-type: none; } @@ -2067,6 +2073,7 @@ img.mail-list-sender-photo { #sidebar-group-list ul, #posted-date-selector { list-style-type: none; } +*/ .profile-thing-list img, .thing-show img, .thing-edit-links a { margin-top: 8px; -- cgit v1.2.3 From 433d964dd52c9db722f9232310d115afe39f52c5 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 18:07:33 -0700 Subject: this makes conversations look a lot better --- view/css/conversation.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index fc3131642..7e439137e 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -58,12 +58,14 @@ .thread-wrapper.toplevel_item { width: 90%; + margin-bottom: 10px; } /* conv_item */ .hide-comments-outer { - margin-left: 10px; + margin-left: 60px; + padding: 15px 10px 15px 10px; } .wall-item-content-wrapper { @@ -213,6 +215,11 @@ .wall-item-tools { clear: both; padding: 5px 10px; + margin-left: 60px; +} + +.comment .wall-item-tools { + margin-left: 0; } .item-tool { -- cgit v1.2.3 From 558e283260f097c2a85ddc8e7bb907d878d046a1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 18:28:36 -0700 Subject: button cleanup directory page --- view/css/widgets.css | 15 +++++++++++++++ view/theme/redbasic/css/style.css | 11 ----------- view/tpl/peoplefind.tpl | 6 +++--- 3 files changed, 18 insertions(+), 14 deletions(-) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index 7c2a03c3b..a3263c64f 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -49,6 +49,21 @@ margin-left: 10px; } +/* peoplefind */ + +#peoplefind-sidebar .btn { + margin: 10px 0 10px 0; +} + +#side-peoplefind-url { + margin-top: 5px; +} + +#side-peoplefind-url { + font-size: 1em; +} + + /* fileas */ .fileas-ul li { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1bfbd711..a03a1f2e3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -632,14 +632,6 @@ footer { margin-top: 20px; } -#side-peoplefind-url { - margin-top: 5px; -} - -#side-peoplefind-url { - font-size: 1em; -} - #side-peoplefind-url::-webkit-input-placeholder { font-family: FontAwesome; } @@ -648,9 +640,6 @@ footer { font-family: FontAwesome; } -#side-peoplefind-submit { - margin-top: 15px; -} #side-match-link { margin-top: 10px; diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index c1462a9e9..5f3dfac8f 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -3,13 +3,13 @@ {{$desc}}
- +
{{if $advanced_search}} {{$advanced_search}}
{{/if}} -- cgit v1.2.3 From c7712d3b45289552ce460f4802ccf934a380c69d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 18:35:37 -0700 Subject: bug fixes after widget cleanup --- view/theme/redbasic/css/style.css | 4 ++-- view/tpl/peoplefind.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a03a1f2e3..0f58b3194 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -632,11 +632,11 @@ footer { margin-top: 20px; } -#side-peoplefind-url::-webkit-input-placeholder { +#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder { font-family: FontAwesome; } -#side-peoplefind-url::-moz-placeholder { +#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder { font-family: FontAwesome; } diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 5f3dfac8f..55bf1575f 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,6 +1,6 @@

{{$findpeople}}

- {{$desc}} +
{{$desc}}
-- cgit v1.2.3 From acc70b9deb36e7114d4738f6b29f4f780a45a1be Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 20:09:19 -0700 Subject: fixing widgets --- view/css/widgets.css | 45 ++++++++++++++++++--------------------- view/theme/redbasic/css/style.css | 8 +++---- view/tpl/group_side.tpl | 9 ++++---- view/tpl/saved_searches.tpl | 2 +- view/tpl/saved_searches_aside.tpl | 2 +- 5 files changed, 32 insertions(+), 34 deletions(-) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index 7c2a03c3b..c6ad647f7 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -45,23 +45,16 @@ opacity: 1; } -.savedsearchterm { - margin-left: 10px; +.saved-search-icon { + float: right; } -/* fileas */ - -.fileas-ul li { - margin-top: 10px; +.savedsearchterm { + display: block; + width: 150px; + overflow: hidden; } -.fileas-link { - margin-left: 24px; -} - -.fileas-all { - margin-left: 0px; -} /* posted date */ @@ -73,17 +66,6 @@ /* categories */ -.categories-ul li { - margin-top: 10px; -} - -.categories-link { - margin-left: 24px; -} - -.categories-all { - margin-left: 0px; -} /* group */ @@ -91,17 +73,32 @@ margin-bottom: 10px; } +#sidebar-new-group { + margin-bottom: 10px; +} + #sidebar-group-list .icon, #sidebar-group-list .iconspacer { display: inline-block; height: 12px; width: 12px; } +.sidebar-group-name { + display: block; + width: 170px; + overflow: hidden; +} + +#sidebar-group-ul { + margin-bottom: 10px; +} + #sidebar-group-list li { margin-top: 3px; } .groupsideedit { + float: right; margin-right: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7ccee2a32..26bfdb656 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -234,6 +234,10 @@ aside ul { padding: 0; } +aside li { + margin-top: 5px; +} + /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; @@ -1730,10 +1734,6 @@ margin-right: 50px; list-style-type: none; } -.pmenu li { - margin-left: -20px; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index a0ed7a82d..dd3c7e737 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -1,6 +1,10 @@

{{$title}}

+ + -
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index d0f9e2b0e..1a9f51af9 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@
    {{foreach $saved as $search}}
  • - + {{$search.displayterm}}
    • {{/foreach}} diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index 615eca39d..0258a7632 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -5,7 +5,7 @@
      {{foreach $saved as $search}}
    • - + {{$search.displayterm}}
      • {{/foreach}} -- cgit v1.2.3 From f191637ffa942cdbf623ad45b29050f51f60ecee Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 20:33:15 -0700 Subject: clean up the group selector on the connedit page --- view/css/widgets.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index d100ae3ec..5087957b2 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -114,9 +114,12 @@ margin-top: 3px; } +.sidebar-group-li input { + float: right; +} + .groupsideedit { float: right; - margin-right: 10px; } .group-edit-icon { -- cgit v1.2.3 From be498be840fd23bc6dc45d6fdef6291621635f02 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 21:08:43 -0700 Subject: a few more alignment issues --- view/css/mod_settings.css | 11 +++++++++++ view/theme/redbasic/css/style.css | 16 ++++------------ view/tpl/settings.tpl | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) (limited to 'view') diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 5b0105204..651167b47 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -1,3 +1,13 @@ + +ul#settings-privacy-macros { + list-style-type: none; + margin: 0 0 10px 0; + padding: 0; +} +#settings-privacy-macros li { + margin-top: 5px; +} + #settings-permissions-wrapper { margin-top: 15px; } @@ -29,6 +39,7 @@ #settings-notifications label { margin-left: 20px; + width: 330px; } #settings-notify-desc, #settings-activity-desc { font-weight: bold; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a7d99efb1..73893ec28 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -480,18 +480,6 @@ aside li { } -.settings-widget ul { - list-style-type: none; - padding: 0px; -} - -.settings-widget li { - margin-left: 24px; - margin-bottom: 8px; -} - - - #fsuggest-desc, #fsuggest-submit-wrapper { margin-top: 15px; margin-bottom: 15px; @@ -1235,6 +1223,10 @@ brain is weird like that */ } +.field input[type="checkbox"] { + width: 16px; +} + .field .onoff { float: left; width: 80px; diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index accd8f106..1fef255f0 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -26,7 +26,7 @@

      {{$lbl_pmacro}}

      -
        +
        • {{$pmacro2}}
        • {{$pmacro1}}
        • {{$pmacro3}}
          • -- cgit v1.2.3 From 962665b8b56491dc59a62f2cb5c05eb353abb79f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 21:46:06 -0700 Subject: saved search adjustments --- view/css/widgets.css | 9 +++++++++ view/theme/redbasic/css/style.css | 13 ------------- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index 5087957b2..326dfa0a1 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -33,6 +33,15 @@ /* saved searches */ + +#netsearch-box #search-submit { + margin: 10px 0 7px 0; +} + +#search-save { + margin: 10px 0 7px 5px; +} + .saved-search-li { margin-top: 3px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 73893ec28..0618a3612 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -629,11 +629,6 @@ aside li { color: #0080FF; } -#netsearch-box { margin-bottom: 5px; } - -#search-save { - margin: 5px 0 0 5px; -} #side-follow-wrapper { margin-top: 20px; @@ -1108,14 +1103,6 @@ aside li { } -#netsearch-box { - margin-top: 20px; -} - -#netsearch-box #search-submit { - margin: 5px 0px 0px 0px; -} - .required { color: #FF0000; } -- cgit v1.2.3