Skip to content

Commit

Permalink
Merge pull request #355 from zanata/ZNTA-2019-nav
Browse files Browse the repository at this point in the history
fix(ZNTA-1019): nav layout bug
  • Loading branch information
kathryngo committed Jun 1, 2017
2 parents 28a2ae6 + 91baf5e commit 1bc9d94
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 30 deletions.
1 change: 1 addition & 0 deletions server/zanata-frontend/src/frontend/app/styles/index.less
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/* For storybook only */
@import './style.less';
35 changes: 5 additions & 30 deletions server/zanata-frontend/src/frontend/app/styles/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ body.templatestyle {
align-items: flex-start;
-webkit-align-items: flex-start; /* Safari 7.0+ */
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -77,7 +76,6 @@ body.templatestyle {
align-items: flex-start;
-webkit-align-items: flex-start; /* Safari 7.0+ */
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -96,7 +94,6 @@ body.templatestyle {
width: 100%;
height: 100%;
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -114,7 +111,6 @@ body.templatestyle {
align-items: flex-start;
-webkit-align-items: flex-start; /* Safari 7.0+ */
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -234,7 +230,6 @@ body.templatestyle {
background-color: @color-light;
box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.185);
display: flex !important;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -250,6 +245,11 @@ body.templatestyle {
}

.nav-link {
display: flex;
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
display: -o-flex;
background-color: '';
color: rgb(237, 242, 248) !important;
flex-direction: column;
Expand Down Expand Up @@ -285,15 +285,6 @@ body.templatestyle {
background-color: '';
}

.nav-link.small {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
display: -o-flex;
}

.nav-link.search {
margin-top: @spacing-rq;
}
Expand All @@ -306,7 +297,6 @@ body.templatestyle {
flex-direction: column;
-webkit-flex-direction: column;
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -317,7 +307,6 @@ body.templatestyle {
flex-direction: row-reverse;
-webkit-flex-direction: row-reverse;
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -328,7 +317,6 @@ body.templatestyle {
display: flex;
align-items: center;
-webkit-align-items: center; /* Safari 7.0+ */
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -342,7 +330,6 @@ body.templatestyle {

.flex-chart-container {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -450,7 +437,6 @@ body.templatestyle {
align-items: center;
-webkit-align-items: center; /* Safari 7.0+ */
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -1366,7 +1352,6 @@ table td {

.locale-options {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -4100,7 +4085,6 @@ td.lang-select .row span svg {

.entry-row, .glossary-paging {
display: flex !important;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -4487,7 +4471,6 @@ img.avatar-round {

.user-profile {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -4541,7 +4524,6 @@ h2.matrix-heading {

.user-profile {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -4726,7 +4708,6 @@ h2.recent-contrib {

.activity-table-inner {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -5268,7 +5249,6 @@ button.list-group-item {
margin-left: @spacing-rh;
color: @color-light;
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -5325,7 +5305,6 @@ a.lineclamp:after {

.flex-row {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand All @@ -5336,7 +5315,6 @@ a.lineclamp:after {

.flex-row-center {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -6658,7 +6636,6 @@ table .projectWideSearchResultsDocumentBody {
@media (min-width: 29.376rem) {
.view {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -6726,7 +6703,6 @@ table .projectWideSearchResultsDocumentBody {

.nav-link {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down Expand Up @@ -7289,7 +7265,6 @@ table .projectWideSearchResultsDocumentBody {

.matrix-table {
display: flex;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
Expand Down

0 comments on commit 1bc9d94

Please sign in to comment.