Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-30 06:40:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
HifiExperiments 2020-09-01 09:37:59 -07:00
parent ae944fd985
commit 9b47d924b3
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/system/html/css/tabs.css
View file

@ -2,11 +2,7 @@
// tabs.css // tabs.css
// //
// Created by Alezia Kurdis on 27 Feb 2020 // Created by Alezia Kurdis on 27 Feb 2020
<<<<<<< HEAD
// Copyright 2020 Project Athena contributors.
=======
// Copyright 2020 Vircadia contributors. // Copyright 2020 Vircadia contributors.
>>>>>>> upstream/master
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -35,15 +31,9 @@ div.tabsContainer {
background-color: #575757; background-color: #575757;
} }
<<<<<<< HEAD
.tabsContainer button.active {
background-color: #2E2E2E;
}
=======
.tabsContainer button.active { .tabsContainer button.active {
background-color: #2E2E2E; background-color: #2E2E2E;
} }
>>>>>>> upstream/master
div.labelTabHeader { div.labelTabHeader {
font-size: 20px; font-size: 20px;
@ -59,11 +49,7 @@ div.tab-section-header {
table.tabsTableFrame { table.tabsTableFrame {
width: 100%; width: 100%;
<<<<<<< HEAD
min-height: 352px;
=======
min-height: 352px; min-height: 352px;
>>>>>>> upstream/master
display: block; display: block;
} }
@ -82,11 +68,7 @@ td.tabsFrame {
td.tabsPropertiesFrame { td.tabsPropertiesFrame {
width: 100%; width: 100%;
vertical-align: top; vertical-align: top;
<<<<<<< HEAD
border:0px;
=======
border: 0px; border: 0px;
>>>>>>> upstream/master
} }
div.tabsPropertiesPage { div.tabsPropertiesPage {