Permalink
Browse files

Merging the CSS files

  • Loading branch information...
bigsylvain committed Dec 11, 2011
1 parent 8d0b53e commit 4aa4ec552c19b4f99117c455ac31cfd16a785444
Showing with 123 additions and 37 deletions.
  1. +123 −37 frontend/stylesheets/agora.css
@@ -1,24 +1,120 @@
+html, body, #container, #main {
+ margin: 0;
+ padding: 0;
+ height: 100%;
+ background: white;
+
+ font-family: "Lucida Grande", Lucida, Helvetica, Arial, sans-serif;
+ color: black;
+}
+
+html {
+ overflow-y: scroll;
+}
+
body {
- font-family: "Lucida Grande", Lucida, Helvetica, Arial, sans-serif;
- background: #FFF;
- color: #333;
- margin: 0;
- padding: 0;
+ /*background-image: url('test-fleurs.png');
+ background-position:center top;
+ background-repeat: repeat-y;
+ background-attachment: fixed;*/
+
+ background-image: url('barre.png');
+ background-repeat: repeat;
}
#container {
- width: 900px;
- margin-left: auto;
- margin-right: auto;
+ width: 1000px;
+ height: auto;
+ margin: 0 auto;
+ min-height: 100%;
+ box-shadow: 0px 0px 30px grey;
}
+/*======================================================
+========================SIDEBAR=========================
+======================================================*/
+
#sidebar {
- float: left;
- width: 200px;
- height: 700px;
- background: white;
- margin: 0;
- padding: 0;
+ float: left;
+ width: 208px;
+ background: white;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+}
+
+#sidebar-logo {
+ height: 62px;
+ background-color: white;
+ padding: 7px;
+}
+
+#sidebar-menu-title {
+ height: 18px;
+}
+
+#name {
+ float:left;
+}
+
+#new-message-counter {
+ float:right;
+}
+
+#sidebar-menu {
+ padding: 5px;
+ border: 1px solid #60BF60;
+ border-radius: 5px 5px;
+ margin: 5px;
+ background: #D4FFD4;
+}
+
+#sidebar-menu p {
+ font-style:italic;
+ font-size:1.1em;
+ margin:0;
+}
+
+#sidebar-chat {
+ padding: 5px;
+ height: 450px;
+ overflow-y: scroll;
+ border: 1px solid #60BF60;
+ border-radius: 5px 5px;
+ margin: 5px;
+ background: #D4FFD4;
+}
+
+#sidebar-chat p {
+ text-align: justify;
+ padding: 0 1em;
+}
+
+#sidebar-chat-response {
+ width: 150px;
+ height: 18px;
+ border: 1px solid #60BF60;
+ margin: 5px;
+ padding: 5px;
+ border-radius: 5px 5px;
+ float: left;
+ background: #D4FFD4;
+}
+
+#sidebar-chat-response p{
+ padding: 1em;
+ margin: 0;
+}
+
+#sidebar-chat-button {
+ width: 18px;
+ height: 18px;
+ border: 1px solid #60BF60;
+ margin: 5px 5px 5px 0px;
+ padding: 5px;
+ border-radius: 5px 5px;
+ float: right;
+ background: #D4FFD4;
}
#sidebar h1 {
@@ -28,31 +124,21 @@ body {
padding: 5px;
}
-.category-title {
- margin-bottom: 5px;
- margin-top: 30px;
-}
+/*======================================================
+========================MAIN============================
+======================================================*/
-#sidebar .user-info {
- display: none;
- padding: 10px;
- background: #73E773;
- color: white;
- font-size: 14px;
- font-weight: bold;
- padding: 15px;
-}
-
-.avatar {
- margin: 10px;
+#main {
+ width: 775px;
+ float: right;
+ margin: 5px 5px 5px 0px;
+ padding: 5px;
+ height: 600px;
}
-#main {
- float: right;
- width: 650px;
- margin-left: 50px;
- height: 100%;
- margin-top: 10px;
+.category-title {
+ margin-bottom: 5px;
+ margin-top: 30px;
}
.thread, .categories {
@@ -213,4 +299,4 @@ div.clear {
.profile-table tr th {
font-weight: bold;
text-align: center;
-}
+}

0 comments on commit 4aa4ec5

Please sign in to comment.