Skip to content

Commit

Permalink
Merge pull request #107 from danielyxie/dev
Browse files Browse the repository at this point in the history
Dev v0.27.0
  • Loading branch information
danielyxie authored Aug 13, 2017
2 parents fd4c6de + 3db6d9d commit a5facac
Show file tree
Hide file tree
Showing 30 changed files with 2,862 additions and 1,118 deletions.
82 changes: 74 additions & 8 deletions css/menupages.css
Original file line number Diff line number Diff line change
Expand Up @@ -365,19 +365,13 @@
display: inline;
}

#faction-hack-div,
#faction-fieldwork-div,
#faction-securitywork-div,
#faction-donate-div {
.faction-work-div {
overflow: hidden;
width: 70%;
height: 100%;
}

#faction-hack-div-wrapper,
#faction-fieldwork-div-wrapper,
#faction-securitywork-div-wrapper,
#faction-donate-div-wrapper {
.faction-work-div-wrapper {
float: left;
border: 2px solid #333;
padding: 14px 6px 4px 6px;
Expand Down Expand Up @@ -592,3 +586,75 @@ div.faction-clear {
text-decoration: none;
cursor: pointer;
}

/* Gang */
#gang-container {
position: fixed;
padding: 6px;
}



.gang-member-header {
background-color: #444;
font-size: 20px;
color: white;
margin: 6px 6px 0px 6px;
padding: 6px;
cursor: pointer;
width: 80%;
text-align: left;
border: none;
outline: none;
}

.gang-member-header.active,
.gang-member-header:hover {
background-color: #555;
}

.gang-member-header.active:hover {
background-color: #666;
}

.gang-member-header:after {
content: '\02795'; /* "plus" sign (+) */
font-size: 13px;
color: white;
float: right;
margin-left: 5px;
}

.gang-member-header.active:after {
content: "\2796"; /* "minus" sign (-) */
font-size: 13px;
color: white;
float: right;
margin-left: 5px;
}

.gang-member-panel {
margin: 0px 6px 6px 6px;
padding: 0px 6px 6px 6px;
width: 75%;
margin-left: 5%;
display: none;
background-color: #555;
overflow:auto;
}

.gang-member-panel div,
.gang-member-panel ul,
.gang-member-panel p,
.gang-member-panel ul > li {
background-color: #555;
}

#gang-management-subpage > p {
padding: 4px;
}

.gang-member-info-div {
float:left;
background-color: #555;
}
22 changes: 6 additions & 16 deletions css/popupboxes.css
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,7 @@
color: white;
}

/* Purchase RAM for Home computer pop-up box */
#purchase-ram-for-home-box-container {
transition: opacity 400ms ease-in;
}

/* Purchase Invitation Box */
/* Purchase Augmentation Box */
#purchase-augmentation-box-container {
transition: opacity 400ms ease-in;
}
Expand All @@ -116,16 +111,6 @@
padding: 4px;
}

/* Travel Pop-up Box */
#travel-box-container {
transition: opacity 400ms ease-in;
}


#travel-box-text {
margin: 8px;
}

/* Infiltration-box */
#infiltration-box-sell,
#infiltration-box-faction {
Expand All @@ -134,6 +119,11 @@
margin: 8px;
}

/* Generic Yes No Box */
#yes-no-text-input-box-input {
color: white;
}

/* Game Options */
#game-options-container {
transition: opacity 400ms ease-in;
Expand Down
Loading

0 comments on commit a5facac

Please sign in to comment.