From 02bf55675358695ddbec131bbc0a4c4c32fea426 Mon Sep 17 00:00:00 2001 From: anuj_thakur Date: Sat, 25 Mar 2017 14:05:03 +0530 Subject: [PATCH] student view and navigation fixes --- imports/client/views/nonOrg/enter/SignupView.js | 4 +- imports/client/views/nonOrg/enter/signup.css | 12 +- .../client/views/org/admin/students/StudentView.js | 211 +++++++++++++++------ .../client/views/org/admin/students/addStudent.js | 2 + public/css/assets/css/components.css | 14 +- public/css/assets/css/core.css | 9 +- 6 files changed, 180 insertions(+), 72 deletions(-) diff --git a/imports/client/views/nonOrg/enter/SignupView.js b/imports/client/views/nonOrg/enter/SignupView.js index 31891cc..93db991 100644 --- a/imports/client/views/nonOrg/enter/SignupView.js +++ b/imports/client/views/nonOrg/enter/SignupView.js @@ -4,7 +4,7 @@ import { Icon } from '/imports/client/components/Icon' import { LinkContainer } from 'react-router-bootstrap'; import { Row, Col, FormGroup, ControlLabel, FormControl, - InputGroup, Button, + InputGroup, Button, Navbar,Modal, Nav, NavItem, Glyphicon, Collapse, NavbarToggler, NavbarBrand, @@ -52,7 +52,7 @@ export default class Signup extends React.Component { return(
-
+

Welcome to YoungDesk!!!

diff --git a/imports/client/views/nonOrg/enter/signup.css b/imports/client/views/nonOrg/enter/signup.css index 90dc0f6..67c98ee 100644 --- a/imports/client/views/nonOrg/enter/signup.css +++ b/imports/client/views/nonOrg/enter/signup.css @@ -32,7 +32,7 @@ text-align: center; } -.contact +.signupView .contact { text-align: center; text-indent: 0px !important; @@ -43,24 +43,24 @@ /*width:1300px !important;*/ } -h1 +.signupView h1 { font-size: 45px !important; } -p +.signupView p { text-indent: 50px; text-align: justify; font-size:15px; } -h6 +.signupView h6 { text-align: center; } -i +.signupView i { display: inline-block; width: 100%; @@ -90,7 +90,7 @@ i font-size: 14px; } -hr { +.signupView hr { display: block; height: 1px; border: 0; diff --git a/imports/client/views/org/admin/students/StudentView.js b/imports/client/views/org/admin/students/StudentView.js index 25a30c2..ba4421d 100644 --- a/imports/client/views/org/admin/students/StudentView.js +++ b/imports/client/views/org/admin/students/StudentView.js @@ -3,9 +3,11 @@ import { Meteor } from 'meteor/meteor'; import React, { Component } from 'react'; import { Link,browserHistory } from 'react-router'; -import { FormGroup,Panel,Table, - ButtonToolbar,Modal, - FormControl,Glyphicon,Button } from 'react-bootstrap'; +import { Navbar,Modal, Nav, NavItem, + Glyphicon, Collapse, FormGroup, FormControl, Panel, + NavbarToggler, NavbarBrand, Table, ButtonToolbar, + NavLink, DropdownItem, DropdownToggle, DropdownMenu, + NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap'; import { AddStudent } from './addStudent'; import { StudentTable } from './StudentTable'; import { Header } from './Header'; @@ -47,65 +49,150 @@ export class StudentView extends Component { return _.includes(item.firstName.toLowerCase(),firstNameSearch.toLowerCase()); }); return ( -
-
-
-
- - - -
-
-
-
-
- -
-
- Advanced Search -
    -
    • -
-
- -
-
-
- this.onUpdate('firstNameSearch',e.target.value)} - placeholder="First Name" - /> -
- -
-
-
-
-
-
-
- this.onUpdate('lastNameSearch',e.target.value)} - placeholder="Last Name" /> -
- -
-
-
-
- -
- - -
-
-
-
+
+
+
+
+
+ +
+
+ +
+
+
+
+ {/*end sidebar*/} +
+
+
+ + + Users + + + Setup + + + +
    + Support + + Account security + Analytics + Accessibility + + All settings + + +
+
+
+ {/*content*/} + +
+
+
+
+ + + +
+
+
+
+
+ +
+
+ Advanced Search +
    +
    • +
+
+ +
+
+
+ this.onUpdate('firstNameSearch',e.target.value)} + placeholder="First Name" + /> +
+ +
+
+
+
+
+
+
+ this.onUpdate('lastNameSearch',e.target.value)} + placeholder="Last Name" /> +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
); }; diff --git a/imports/client/views/org/admin/students/addStudent.js b/imports/client/views/org/admin/students/addStudent.js index c2d1528..c99fa52 100644 --- a/imports/client/views/org/admin/students/addStudent.js +++ b/imports/client/views/org/admin/students/addStudent.js @@ -51,9 +51,11 @@ export class AddStudent extends Component { + {/* + */} ); diff --git a/public/css/assets/css/components.css b/public/css/assets/css/components.css index fbaa4be..532da2a 100644 --- a/public/css/assets/css/components.css +++ b/public/css/assets/css/components.css @@ -215,6 +215,7 @@ a.badge, font-weight: 500; font-size: 11px; line-height: 1.82; + color: #000; } .category-title > i { position: absolute; @@ -366,6 +367,7 @@ a.badge, .navigation li a > i { float: left; top: 0; + width: auto; margin-top: 2px; margin-right: 15px; -webkit-transition: opacity 0.2s ease-in-out; @@ -571,6 +573,9 @@ a.badge, background-color: #f5f5f5; color: #333333; } +.sidebar-default .navigation > li > a > span { + color: inherit; +} .sidebar-default .navigation > li.active > a .label-transparent { color: #333333; } @@ -20221,4 +20226,11 @@ label.display-block { .sidebar-xs .sidebar-main .navigation > li:hover > a:after { display: block !important; -} \ No newline at end of file +} +/*multistep*/ +.stepy-validation div[style*="text-align: left"] { + text-align: right !important; +} +.stepy-validation div[style*="display: inline-block"] .btn i { + display: none; +} diff --git a/public/css/assets/css/core.css b/public/css/assets/css/core.css index c477836..6e3389a 100644 --- a/public/css/assets/css/core.css +++ b/public/css/assets/css/core.css @@ -4041,7 +4041,7 @@ select[multiple].input-group-xs > .input-group-btn > .btn { -webkit-box-shadow: 0 1px 0 #fff; box-shadow: 0 1px 0 #fff; } - .navbar-inverse .navbar-nav .open .dropdown-menu a:not(.label-flat):not(.badge-flat):not(.disabled > a) { + .navbar-inverse .navbar-nav .open .dropdown-menu a:not(.label-flat):not(.badge-flat):not(.disabled) > a { color: rgba(255, 255, 255, 0.9); } .navbar-inverse .navbar-nav .open .dropdown-menu .divider { @@ -4710,6 +4710,10 @@ ul.dropdown-menu .dropdown-content-heading:first-child { .breadcrumb > li i { display: inline-block; font-size: 12px; + width: auto; +} +.breadcrumb > li span{ + color: inherit; } .breadcrumb > li > .dropdown-menu { margin-top: 0; @@ -4856,6 +4860,9 @@ ul.dropdown-menu .dropdown-content-heading:first-child { margin-left: 20px; margin-right: 20px; } +.breadcrumb-elements > li i{ + width: auto; +} .breadcrumb-line[class*=bg-] a, .breadcrumb-line[class*=bg-] i { color: inherit; -- 2.0.0