Skip to content

Commit

Permalink
backup before exibition
Browse files Browse the repository at this point in the history
  • Loading branch information
Super-User committed Oct 23, 2014
1 parent 2804a22 commit d1ce739
Show file tree
Hide file tree
Showing 30 changed files with 2,679 additions and 1,518 deletions.
413 changes: 212 additions & 201 deletions createGroup.php
View file

Large diffs are not rendered by default.

564 changes: 295 additions & 269 deletions createMeeting.php
View file

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions css/b.min.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ table {
border-collapse: collapse;
}
td, th {
padding: 0;
padding: 5px;
}
@media print{
* {
Expand Down Expand Up @@ -836,14 +836,15 @@ html {
}
body {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 18px;
font-size: 15px;
line-height: 1.42857143;
color: #333;
}
input, button, select, textarea {
font-family: inherit;
font-size: inherit;
line-height: inherit;
margin-right: 10px;
}
a {
color: #ffffff;
Expand Down Expand Up @@ -959,6 +960,7 @@ h6, .h6 {
}
p {
margin: 0 0 10px;
text-align: justify;
}
.lead {
margin-bottom: 20px;
Expand Down Expand Up @@ -1221,7 +1223,6 @@ pre code {
}
.container {
padding-right: 50px;
padding-top: 50px;
/*margin-right: auto;*/
/*margin-left: 120px;*/
}
Expand Down Expand Up @@ -2979,7 +2980,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
.nav > li > a {
position: relative;
display: block;
padding: 10px 15px;
padding: 10px 5px;
}
.nav > li > a:hover, .nav > li > a:focus {
text-decoration: none;
Expand Down Expand Up @@ -3144,7 +3145,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
}
.navbar {
position: relative;
height: 150px;
height: 120px;
margin-bottom: 0px;
border: 1px solid transparent;
}
Expand Down Expand Up @@ -3292,6 +3293,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
padding-top: 10px;
padding-bottom: 10px;
line-height: 20px;
font-size: 13px;
}
@media (max-width:767px){
.navbar-nav .open .dropdown-menu {
Expand Down Expand Up @@ -3336,7 +3338,6 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
}
.navbar-right {
float: right!important;
padding-top: 50px;
}
}
.navbar-form {
Expand Down Expand Up @@ -3525,7 +3526,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
color: #ccc;
}
.navbar-inverse {
background-color: #222;
background-color: #333;
border-color: #080808;
}
.navbar-inverse .navbar-brand {
Expand Down
2 changes: 1 addition & 1 deletion css/chosen.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ This file is generated by `grunt build`, do not edit it by hand.
.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
margin: 1px 0;
padding: 5px;
height: 15px;
height: 26px;
outline: 0;
border: 0 !important;
background: transparent !important;
Expand Down
2 changes: 1 addition & 1 deletion css/chosen.min.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions css/fullcalendar/fullcalendar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ html .fc,
}

.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
background: #fcf8e3;
background: #DFF0DF;
}

.fc-cell-overlay { /* semi-transparent rectangle while dragging */
Expand Down Expand Up @@ -271,8 +271,8 @@ html .fc,
}

.fc-event {
border: 1px solid #3a87ad; /* default BORDER color */
background-color: #3a87ad; /* default BACKGROUND color */
border: 1px solid #669933; /* default BORDER color */
background-color: #669933; /* default BACKGROUND color */
color: #fff; /* default TEXT color */
font-size: .85em;
cursor: default;
Expand Down
16 changes: 9 additions & 7 deletions css/login.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
body{
height: 100%;
width:100%;
background: url('../img/bg.jpg') no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
Expand All @@ -10,10 +9,8 @@ body{

.Container{
width:1300px;
padding-right: 15px;
padding-left: 15px;
margin-right: auto;
margin-left: auto;
margin-left: 50px;
margin-top: 100px;
}

h1{
Expand All @@ -36,6 +33,11 @@ td{

.heading{
width: 800px;
border-style: solid;
border-color: #669933;
background-color: white;
padding-left:20px;
padding-right:20px;
}


Expand All @@ -50,8 +52,8 @@ td{
border-radius: 0px 4px 4px 4px;
}

.nav > li{
background-color: rgb(192,252,211);
.nav-tabs > li{
background-color: grey;
border-radius: 4px 4px 0px 0px;
}

Expand Down
70 changes: 46 additions & 24 deletions css/s.css
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
body{
background-color: #FCFFD9;
}

/*******styles for divs******/
#profile_header {width: 100%;
height: 50px;
Expand Down Expand Up @@ -45,12 +49,16 @@
border-color: #BBBBBB}

#main {
padding-right: 15px;
padding-left: 15px;
padding-top: 180px;
margin: 0 auto; /* center the div */
padding-right: 25px;
padding-left: 25px;
padding-top: 25px;
padding-bottom: 25px;
margin: 150px auto;
width: 850px;

background-color: white;
border-radius: 4px;
border-color:#669933;
border-style: solid
}

#meetingLists {width: 800px;
Expand Down Expand Up @@ -119,6 +127,14 @@ a.account:hover {vertical-align: middle;
color: #FFFFFF;
font-size: 20px;
text-decoration: none;}

.left{
padding-top: 30px;
}

.right{

}
/*End top navigation bar*/

/*side navigation bar*/
Expand Down Expand Up @@ -157,31 +173,32 @@ p.sub_nav_man {display:block;

/*homepage posts of recent and future */
div.post {height: 252px;
width:inherit
display:block;
border-top: ridge;
border-bottom: ridge;
border-color: #BBBBBB;
border-width:1px;}
width:300px;;
display:inline-block;
margin-left: 10px;
margin-bottom: 10px;
border-style: solid;
border-width: 2.5px;
border-color: rgba(225, 210, 162, 1.0)}

div.information {display: inline-block;
width:580px;
width: 280px;;
height: inherit;
float:left;
margin-left: 10px;}
margin-left: 10px;
margin-right: 10px;}

div.chart {display: inline-block;
border-left: solid;
border-style: solid;
border-color: #BBBBBB;
border-width:1px;
width: 250px;
height: 250px;
float:right;}
float:right;
border-radius:4px;}

table.manTable {border: 1px solid black;
margin-right: auto;
margin-left:auto;
margin-top: 10px;}
margin-top: 10px;
margin-bottom: 10px}

tr.meetingRow {height: 30px;}
td.meetingRow {vertical-align: middle;}
Expand All @@ -192,7 +209,7 @@ img.logo {height: 200px;
width: 200px;}

/*styles without any class*/
h2 {margin-left: 20px;
h2 {
font-size: 25px;}

/*!
Expand All @@ -202,8 +219,10 @@ h2 {margin-left: 20px;
* For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/
.navbar-brand img{
width: 150px;
height:150px;
width: 130px;
height:130px;
margin-left: 60px;
margin-top: 20px;
}

.nav h3{
Expand Down Expand Up @@ -233,7 +252,7 @@ h2 {margin-left: 20px;
height: 100%;
margin-left: -250px;
overflow-y: auto;
background: #222;
background: #333;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
Expand Down Expand Up @@ -311,6 +330,9 @@ h2 {margin-left: 20px;
background: none;
}




@media(min-width:768px) {
#wrapper {
padding-left: 250px;
Expand All @@ -336,4 +358,4 @@ h2 {margin-left: 20px;
position: relative;
margin-right: 0;
}
}
}
Binary file added img/free-cork-texture.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/pin.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.
Loading

0 comments on commit d1ce739

Please sign in to comment.