Merge pull request #2809 from Hypolite/frio-fix-terms

[frio] Fix terms capitalization
This commit is contained in:
rabuzarus 2016-09-29 12:40:23 +02:00 committed by GitHub
commit 835edf74b3

View File

@ -3,7 +3,7 @@ To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates To change this template file, choose Tools | Templates
and open the template in the editor. and open the template in the editor.
*/ */
/* /*
Created on : 17.02.2016, 23:55:45 Created on : 17.02.2016, 23:55:45
Author : rabuzarus Author : rabuzarus
*/ */
@ -174,7 +174,7 @@ a#item-delete-selected {
background: $btn_primary_hover_color; background: $btn_primary_hover_color;
border-color: none; border-color: none;
} }
.btn-link { .btn-link {
/* color: #6fdbe8;*/ /* color: #6fdbe8;*/
color: $link_color; color: $link_color;
@ -287,7 +287,7 @@ header #banner {
whitespace: nowrap; whitespace: nowrap;
padding-left: 55px; padding-left: 55px;
} }
header #banner #logo-img, header #banner #logo-img,
.navbar-brand #logo-img { .navbar-brand #logo-img {
/*mask: url('network#m1');*/ /*mask: url('network#m1');*/
/*mask-image: url('img/friendica-25.png');*/ /*mask-image: url('img/friendica-25.png');*/
@ -419,7 +419,7 @@ nav.navbar .nav>li>a:focus{
top: 4px; top: 4px;
right: -2px; right: -2px;
background-color: #ff8989; background-color: #ff8989;
/* text-transform: uppercase; /* text-transform: uppercase;
display: inline-block; display: inline-block;
padding: 3px 5px 4px; padding: 3px 5px 4px;
@ -794,7 +794,8 @@ nav.navbar a {
color: $nav_icon_color; color: $nav_icon_color;
font-weight: 400; font-weight: 400;
font-size: 13px; font-size: 13px;
padding: 4px 15px padding: 4px 15px;
text-transform: capitalize;
} }
.nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li a i,
.nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li a i,
@ -1093,7 +1094,7 @@ aside #group-sidebar li .group-edit-tool:first-child {
width: 90px;*/ width: 90px;*/
} }
#contact-block contact-block-link { #contact-block contact-block-link {
} }
#contact-block .contact-block-img { #contact-block .contact-block-img {
height: 75px; height: 75px;
@ -1122,6 +1123,7 @@ section #jotOpen {
#jot-modal .modal-header a, #jot-modal .modal-header a,
#profile-jot-submit-wrapper a { #profile-jot-submit-wrapper a {
color: #555; color: #555;
text-transform: capitalize;
} }
#jot-modal .modal-header { #jot-modal .modal-header {
border-bottom: none; border-bottom: none;
@ -1498,6 +1500,7 @@ blockquote.shared_content {
.wall-item-actions .button-likes { .wall-item-actions .button-likes {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
text-transform: capitalize;
} }
/* wall item hover effects */ /* wall item hover effects */
@ -1648,7 +1651,7 @@ img.acpopup-img {
.wall-item-container.thread_level_6, .wall-item-container.thread_level_6,
.wall-item-container.thread_level_7 { .wall-item-container.thread_level_7 {
margin-left: 15px; margin-left: 15px;
} }
/* Menubar Tabs */ /* Menubar Tabs */
#tabmenu, #tabmenu,
@ -1681,7 +1684,7 @@ ul.tabs li {
transition: all .15s ease; transition: all .15s ease;
} }
/*ul.tabs.visible-xs > li.active { /*ul.tabs.visible-xs > li.active {
min-width: 150px; This is a workaround to make the topbar-second dropdown better visible on mobile. We need something better here min-width: 150px; This is a workaround to make the topbar-second dropdown better visible on mobile. We need something better here
}*/ }*/
ul.tabs li a { ul.tabs li a {
margin-left: 10px; margin-left: 10px;
@ -1895,7 +1898,7 @@ ul.viewcontact_wrapper > li {
} }
.contact-wrapper .contact-photo-image-wrapper img.contact-photo.xl { .contact-wrapper .contact-photo-image-wrapper img.contact-photo.xl {
height: 80px; height: 80px;
width: 80px; width: 80px;
} }
.contact-wrapper .contact-photo-image-wrapper img.contact-photo-xs { .contact-wrapper .contact-photo-image-wrapper img.contact-photo-xs {
height: 48px; height: 48px;
@ -1912,7 +1915,7 @@ ul.viewcontact_wrapper > li {
margin-top: -20px; margin-top: -20px;
} }
.contact-wrapper .media-body .contact-entry-name h4.media-heading a { .contact-wrapper .media-body .contact-entry-name h4.media-heading a {
font-weight: bold !important; font-weight: bold !important;
color: $link_color; color: $link_color;
font-size: 15px !important; font-size: 15px !important;
} }
@ -2272,7 +2275,7 @@ ul.notif-network-list > li:hover .intro-action-buttons {
/* Search Page */ /* Search Page */
/* This is a little bit hacky. Since the search page is used for diferent /* This is a little bit hacky. Since the search page is used for diferent
content types we can't apply the generic-page-wrapper class. content types we can't apply the generic-page-wrapper class.
So we apply the css of the generic-page-wrapper class to the ul element with some So we apply the css of the generic-page-wrapper class to the ul element with some
little modifications to emulate a standard page template */ little modifications to emulate a standard page template */
@ -2381,7 +2384,7 @@ main .nav-tabs>li.active>a:hover {
#contact-list ul.dropdown-menu.textcomplete-dropdown.media-list > li:first-child { #contact-list ul.dropdown-menu.textcomplete-dropdown.media-list > li:first-child {
display: none; display: none;
} }
#contact-list ul.dropdown-menu.textcomplete-dropdown.media-list #contact-list ul.dropdown-menu.textcomplete-dropdown.media-list
.textcomplete-item > a { .textcomplete-item > a {
padding: 0 !important; padding: 0 !important;
border-left: none; border-left: none;