3 Commits 2f79eebb20 ... e296d3e940

Author SHA1 Message Date
  Arthur Araújo e296d3e940 frontend 6 years ago
  Arthur Araújo f21c20c60f configs para dev 6 years ago
  Arthur Araújo bfbc32eb5d config docker para mongodb 6 years ago
10 changed files with 64 additions and 11 deletions
  1. 1 0
      .gitignore
  2. 6 0
      docker-compose.yml
  3. 2 1
      package.json
  4. 52 9
      public/css/main.css
  5. BIN
      public/logo2.bkp.png
  6. BIN
      public/logo2.png
  7. BIN
      public/logo_min.bkp.png
  8. BIN
      public/logo_min.png
  9. 3 1
      views/account/login.html
  10. 0 0
      views/home.html

+ 1 - 0
.gitignore

@@ -23,6 +23,7 @@ public/media/
 # Dependency directory
 node_modules
 bower_components
+package-lock.json
 
 # Editors
 .idea

+ 6 - 0
docker-compose.yml

@@ -0,0 +1,6 @@
+mongo:
+  image: mongo
+  volumes:
+    - db:/data/db
+  ports:
+    - 27017:27017

+ 2 - 1
package.json

@@ -3,7 +3,8 @@
   "version": "1.0.0",
   "description": "",
   "scripts": {
-    "start": "node server.js"
+    "start": "node server.js",
+    "dev": "NODE_ENV=DEV nodemon server.js"
   },
   "dependencies": {
     "async": "^1.5.2",

+ 52 - 9
public/css/main.css

@@ -20,11 +20,21 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 a {
-  color: #668c6d;
+  color: #42923e;
 }
 
 a:hover {
-  text-decoration: none;
+  color: #1a481b;
+  text-decoration: underline;
+  /*text-decoration: none;*/
+}
+
+.require {
+  color: darkred;
+}
+
+.color-green {
+  color: #42923e;
 }
 
 footer {
@@ -42,11 +52,25 @@ footer {
   margin-left: 7.5px;
   font-size: 25pt;
   text-align: center;
-  color: #555555 !important;
+  color: #999 !important;
+}
+
+.footer-icons:hover {
+  padding-top: 10px;
+  margin-right: 7.5px;
+  margin-left: 7.5px;
+  font-size: 25pt;
+  text-align: center;
+  color: #333 !important;
+  text-decoration: none;
+}
+
+.fix-hover-underline a:hover {
+  text-decoration: none;
 }
 
 .login-container {
-  max-width: 555px;
+  max-width: 400px;
 }
 
 /* Alerts
@@ -77,7 +101,8 @@ footer {
 
 .navbar-default {
   background-color: #fff;
-  border-color: #e0e0e0;
+  border-color: #c5d8c5;
+  height: 60px;
 }
 
 .navbar-default .navbar-nav {
@@ -86,15 +111,16 @@ footer {
 
 .navbar-default .navbar-nav > li > a {
   color: #262626;
-  border-bottom: 3px solid transparent;
+  border-bottom: 4px solid transparent;
   padding-top: 17.5px;
   padding-bottom: 14.5px;
   transition: all 0.25s;
+  height: 60px;
 }
 
 .navbar-default .navbar-nav > li > a:hover {
-  background-color: transparent;;
-  border-bottom-color: #bdbdbd;
+  background-color: transparent;
+  border-bottom-color: rgba(0, 0, 0, .2);
 }
 
 .navbar-default .navbar-nav > li > a.navbar-avatar {
@@ -109,9 +135,19 @@ footer {
 }
 
 .navbar-default .navbar-nav > li.active > a {
-  border-bottom-color: #7c916f;
+  border-bottom-color: #42923e;
   background-color: transparent;
   color: #262626;
+  font-weight: 600;
+}
+
+.dropdown-menu li a {
+  color: #333;
+}
+
+.dropdown-menu li a:hover {
+  color: #42923e;
+  text-decoration: underline;
 }
 
 /* Panels
@@ -250,6 +286,12 @@ footer {
   color: #fff;
 }
 
+.btn-cancel:hover {
+  color: #fff;
+  background-color: #ff4136;
+  border-color: #ff291c;
+}
+
 /* Forms */
 /* ------------------------- */
 
@@ -268,6 +310,7 @@ textarea {
 .form-group > label {
   text-transform: uppercase;
   font-size: 13px;
+  font-weight: 600;
 }
 
 .hr-title {

BIN
public/logo2.bkp.png


BIN
public/logo2.png


BIN
public/logo_min.bkp.png


BIN
public/logo_min.png


+ 3 - 1
views/account/login.html

@@ -22,10 +22,12 @@
           <label for="password">Senha</label>
           <input type="password" name="password" id="password" placeholder="Senha" class="form-control">
         </div>
-        <div class="form-group"><a href="/forgot"><strong>Esqueceu sua senha?</strong></a></div>
+        <div class="form-group pull-right" style="padding-top: 6px"><a href="/forgot">Esqueceu sua senha?</a></div>
         <button type="submit" class="btn btn-success">Entrar</button>
       </form>
+      <br>
       <div class="hr-title"><span>ou</span></div>
+      <br>
       <div class="btn-toolbar text-center">
         <a href="/auth/facebook" class="btn btn-facebook">Entre com o Facebook</a>
         <a href="/auth/twitter" class="btn btn-twitter">Entre com o Twitter</a>

+ 0 - 0
views/home.html


Some files were not shown because too many files changed in this diff