Skip to content

Commit

Permalink
explorer modified
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Thiery committed Apr 5, 2017
1 parent 999e455 commit 1ce6f4f
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 93 deletions.
28 changes: 14 additions & 14 deletions explorer/css/responsive.css
View file
Original file line number Diff line number Diff line change
@@ -1,21 1,21 @@
/* desktop size */
@media all and (min-width: 1400px) {
.label {width: calc(100% / 4 - 1*3.1px);}
.object {width: calc(100% / 4 - 1*3.1px);}
.project {width: calc(100% / 2 - 1*3.1px);}
.resource {width: calc(100% / 4 - 1*3.1px);}
#left {width:calc(70% - 30px) !important;}
#right {width:calc(30% - 30px) !important;}
#navigation {width:60px !important;}
.label {width: calc(100% / 4 - 1*3.1px) !important;}
.object {width: calc(100% / 4 - 1*3.1px) !important;}
.project {width: calc(100% / 2 - 1*3.1px) !important;}
.resource {width: calc(100% / 4 - 1*3.1px) !important;}
#left {width:calc(70% - 15px) !important;}
#right {width:calc(30% - 15px) !important;}
#navigation {width:30px !important;}
}

/* laptop size */
@media not all and (min-width: 1400px) {
.label {width: calc(100% / 3 - 1*3px);}
.object {width: calc(100% / 3 - 1*3px);}
.project {width: calc(100% / 2 - 1*3.1px);}
.resource {width: calc(100% / 3 - 1*3.1px);}
#left {width:calc(65% - 30px) !important;}
#right {width:calc(35% - 30px) !important;}
#navigation {width:60px !important;}
.label {width: calc(100% / 3 - 1*3px) !important;}
.object {width: calc(100% / 3 - 1*3px) !important;}
.project {width: calc(100% / 2 - 1*3.1px) !important;}
.resource {width: calc(100% / 3 - 1*3.1px) !important;}
#left {width:calc(65% - 15px) !important;}
#right {width:calc(35% - 15px) !important;}
#navigation {width:30px !important;}
}
151 changes: 76 additions & 75 deletions explorer/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,20 196,33 @@ select {
#left {
background-color: red;
float:left;
height:calc(100% - 20px - 2*10px);
height:calc(100% - 10px - 2*5px);
}

#right {
background-color: #d0e4f2;
float:right;
height:calc(100% - 20px - 2*10px);
height:calc(100% - 10px - 2*5px);
}

#navigation {
background-color: #1a1f2b;
float: left;
width:60px;
height: calc(100% - 20px - 2*10px);
height: calc(100% - 10px - 2*5px);
}

#footer {
background-color: #1a1f2b;
float: left;
font-size: 10px;
font-style: italic;
font-weight: 300;
color: #d0e4f2;
padding: 5px;
width:calc(100% - 2*5px);
height:10px;
line-height: 12px;
text-align: center;
}

#sidebar {
Expand All @@ -228,13 241,23 @@ select {
width:calc(100%);
height:calc(100%);
}

/*.wrapper {
margin-top: 5px;
float:left;
#filter-items {
float: left;
width:calc(100%);
}*/

height:30px;
}
.itemfilter {
float:left;
background-color:#4a6491;
width: calc(25%);
height: 100%;
font-weight: 300;
text-align: center;
font-size: 15px;
line-height: 28px;
color: #d0e4f2;
cursor: pointer;
}
#filter-select {
float: left;
width:calc(100%);
Expand All @@ -243,7 266,7 @@ select {
clear: both;
float: left;
width:calc(100%);
height:calc(100% - 215px)
height:calc(100% - 245px)
}

#filterheader {
Expand Down Expand Up @@ -325,30 348,17 @@ select {
float:left;
/*overflow-y:auto;*/
width:calc(100%);
height:calc(100%);
height:calc(100% - 50px);
/* width: 100% - 2*padding - border */
}
#contentcontent {
float:left;
width:calc(100%);
height:calc(100% - 10px);
/* width: 100% - 2*padding - border */
}
#footer {
background-color: #1a1f2b;
float: left;
font-size: 14px;
font-style: italic;
font-weight: 300;
color: #d0e4f2;
padding: 10px;
width:calc(100% - 2*10px);
height:20px;
line-height: 20px;
text-align: center;
height:calc(100% - 3px);
/* width: 100% - 2*padding - border */
}


#landingpage {
float:left;
padding: 20px;
Expand All @@ -367,60 377,35 @@ select {
right: 1px !important;
}

#b-labels {
height: 35px;
width: 35px;
background-size: 35px;
margin-left: auto;
margin-right: auto;
margin-top: 20px;
margin-bottom: 20px;
cursor: pointer;
background-image: url("../img/icon-label-active.png");
}
#b-projects {
height: 35px;
width: 35px;
background-size: 35px;
margin-left: auto;
margin-right: auto;
margin-top: 20px;
margin-bottom: 20px;
cursor: pointer;
background-image: url("../img/icon-project-active.png");
}
#b-objects {
height: 35px;
width: 35px;
background-size: 35px;
margin-left: auto;
margin-right: auto;
margin-top: 20px;
margin-bottom: 20px;
cursor: pointer;
background-image: url("../img/icon-object-active.png");
}
#b-resources {
height: 35px;
width: 35px;
background-size: 35px;
margin-left: auto;
margin-right: auto;
margin-top: 20px;
margin-bottom: 20px;
cursor: pointer;
background-image: url("../img/icon-resource-active.png");
}
#b-home {
height: 20px;
width: 20px;
margin-top: 58px;
margin-left: 3px;
}

#search {
float:left;
background-color: #85a5cc;
height: 50px;
width: calc(100%);
}
#searchString {
border: none;
color: #d0e4f2;
background: 0 0;
font-size: 24px;
margin-top: 8px;
float: left;
margin-left: 10px;
width: calc(100% - 2*10px);
}

.disablediv {
pointer-events: none;
opacity: 0.6;
}

#filter-properties {
height: calc(100% - 215px);
}

.filter-properties {
background-color: #85a5cc;
float: left;
Expand Down Expand Up @@ -467,3 452,19 @@ select {
border:none;
padding-bottom:20px;
}

input::-webkit-input-placeholder {
color: #4a6491 !important;
}

input:-moz-placeholder { /* Firefox 18- */
color: #4a6491 !important;
}

input::-moz-placeholder { /* Firefox 19 */
color: #4a6491 !important;
}

input:-ms-input-placeholder {
color: #4a6491 !important;
}
Binary file added explorer/img/home.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions explorer/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 60,16 @@
<body>
<div id="page">
<div id="navigation">
<div id="b-labels" class="disablediv"></div>
<div id="b-objects"></div>
<div id="b-projects"></div>
<div id="b-resources"></div>
<div id="b-home"><img src="img/home.png"></div>
</div>
<div id="right">
<div id="filter">
<div id="filter-items">
<div id="b-labels" class="itemfilter disablediv">labels</div>
<div id="b-objects" class="itemfilter">objects</div>
<div id="b-projects" class="itemfilter">projects</div>
<div id="b-resources" class="itemfilter">resources</div>
</div>
<div id="filter-select">
<div id="filterheader"><div id="funnel" style="font-style:italic;float:left;"><img src="img/icon-funnel.png" style="height:25px"></div><div id="header-info" style="font-style:italic;float:left;"></div></div>
<div id="filter-project" class="filter-select">filter data by project</div>
Expand Down Expand Up @@ -113,6 116,7 @@
</div>
</div>
<div id="left">
<div id="search"><input id="searchString" type="text" placeholder="search item" autofocus></div>
<div id="content" class="nano">
<div id="contentcontent" class="nano-content"></div>
</div>
Expand Down

0 comments on commit 1ce6f4f

Please sign in to comment.