Commit 64c64bd4 authored by mduppanapudi-nisum-com's avatar mduppanapudi-nisum-com Committed by tdutta-nisum-com

Merge conflict and reverting Mt-49 scrollIssue (#23)

parent 27a29b2e
#header { #header {
    width: 100%; width: 100%;
    height: 8%; height: 8%;
    background-color: darkslategray; background-color: darkslategray;
} }
#sidebar-left { #sidebar-left {
    float: left; float: left;
    width: 20%; width: 20%;
    height: 87.5%; height: 87.5%;
} }
#main { #main {
    float: left; float: left;
    width: 80%; width: 80%;
    height: 87.5%; height: 87.5%;
    background-color: floralwhite; background-color: floralwhite;
    margin-left:-7px; margin-left:-7px;
} }
#footer { #footer {
    height: 8%; height: 8%;
    width: 100%; width: 100%;
} }
.myGrid { .myGrid {
    width:98.5%; width:98.5%;
    height: 300px; height: 300px;
    margin-left:5px; margin-left:5px;
} }
#gridTest,#gridTest1 .ui-grid-cell-contents{ #gridTest,#gridTest1 .ui-grid-cell-contents{
    text-align:center; text-align:center;
} }
.watermark { .watermark {
position: absolute; position: absolute;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
opacity: 0.75; opacity: 0.75;
width: 100%; width: 100%;
text-align: center; text-align: center;
z-index: 1000; z-index: 1000;
} }
.md-button { .md-button {
text-transform: capitalize !important; text-transform: capitalize !important;
} }
.carousel-indicators li{ .carousel-indicators li{
    background-color:orange; background-color:orange;
    border-color:#ff9200; border-color:#ff9200;
} }
.carousel-indicators .active{ .carousel-indicators .active{
    background-color:orange; background-color:orange;
    border-color:#ff9200; border-color:#ff9200;
} }
md-dialog{ md-dialog{
    margin-left: 15%; margin-left: 15%;
} }
.navbar-inverse { .navbar-inverse {
background-color: darkslategray; background-color: darkslategray;
border-color: darkslategray; border-color: darkslategray;
color:#fff; color:#fff;
} }
.navbar-inverse .navbar-nav>.dropdown>a .caret { .navbar-inverse .navbar-nav>.dropdown>a .caret {
border-top-color: #fff; border-top-color: #fff;
border-bottom-color: #fff; border-bottom-color: #fff;
} }
.navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus {
color: #fff; color: #fff;
background-color: darkslategray; background-color: darkslategray;
} }
.mainDivHeaderClass{ .mainDivHeaderClass{
    text-align: center; text-align: center;
background: cadetblue; background: cadetblue;
color: floralwhite; color: floralwhite;
border-radius: 5px; border-radius: 5px;
} }
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
display: none; display: none;
float: left; float: left;
width: 290px; width: 290px;
height:261px; height:261px;
padding: 0; padding: 0;
margin: 0; margin: 0;
list-style: none; list-style: none;
background-color: transparent; background-color: transparent;
border: 1px solid rgba(0,0,0,0.15); border: 1px solid rgba(0,0,0,0.15);
border-radius: 5px; border-radius: 5px;
-webkit-box-shadow: 0 6px 6px rgba(0,0,0,0.175); -webkit-box-shadow: 0 6px 6px rgba(0,0,0,0.175);
box-shadow: 0 6px 6px rgba(0,0,0,0.175); box-shadow: 0 6px 6px rgba(0,0,0,0.175);
background-clip: padding-box; background-clip: padding-box;
} }
.autoComplete-dropdown{ .autoComplete-dropdown{
    font: inherit; font: inherit;
    border-color: #ececec; border-color: #ececec;
    border-width: 1px; border-width: 1px;
    width: 206px; width: 206px;
    cursor: pointer; cursor: pointer;
    position: absolute; position: absolute;
    z-index: 9999; z-index: 9999;
    top: 35px; top: 35px;
    overflow-y: auto; overflow-y: auto;
    max-height: 206px; max-height: 206px;
} }
.selectHeader { .selectHeader {
Please note: All these selectors are only applied to children of elements with the 'selectdemoSelectHeader' class Please note: All these selectors are only applied to children of elements with the 'selectdemoSelectHeader' class
} }
.selectHeader .searchBoxHeader { .selectHeader .searchBoxHeader {
border: none; border: none;
outline: none; outline: none;
} }
.selectHeader .selectHeaderChild { .selectHeader .selectHeaderChild {
     box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1), 0 0 0 0 rgba(0, 0, 0, 0.14), 0 0 0 0 rgba(0, 0, 0, 0.12); box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1), 0 0 0 0 rgba(0, 0, 0, 0.14), 0 0 0 0 rgba(0, 0, 0, 0.12);
     padding-left: 10.667px; padding-left: 10.667px;
     height: 48px; height: 48px;
     cursor: pointer; cursor: pointer;
     position: relative; position: relative;
     display: flex; display: flex;
     width: auto; width: auto;
     position: fixed; position: fixed;
     z-index: 10; z-index: 10;
     background: white; background: white;
     width: 100%; width: 100%;
} }
.optionScroll{ .optionScroll{
    margin-top:50px; margin-top:50px;
} }
.selectHeader .md-content._md { .selectHeader .md-content._md {
    max-height: 240px; max-height: 240px;
     } }
.md-dialog-container { .md-dialog-container {
    z-index: 100 !important; z-index: 100 !important;
}    }
.md-select-menu-container { .md-select-menu-container {
    z-index: 100 !important; z-index: 100 !important;
} }
/* Styles added*/
.selectdemoSelectHeader {
    /* Please note: All these selectors are only applied to children of elements with the 'selectdemoSelectHeader' class */ } .md-dialog-custom-height {
    .selectdemoSelectHeader .demo-header-searchbox { max-height: 95% !important;
     border: none; }
     outline: none;
     height: 100%; .md-content{
     width: 100%; height: 1100px !important;
     padding: 0; } }
    .selectdemoSelectHeader .demo-select-header {
     box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1), 0 0 0 0 rgba(0, 0, 0, 0.14), 0 0 0 0 rgba(0, 0, 0, 0.12);
     padding-left: 10.667px;
     height: 48px; .selectdemoSelectHeader .demo-header-searchbox {
     cursor: pointer; border: none;
     position: relative; outline: none;
     display: flex; height: 100%;
     align-items: center; width: 100%;
     width: auto; } padding: 0;
    .selectdemoSelectHeader md-content._md { }
     max-height: 240px; }
    .leads-data{border: 1px solid #ccc; padding: 5px 10px; float: left; width: 100%;} .selectdemoSelectHeader .demo-select-header {
    .leads-data p{float: left; width: auto; background: #ccc; margin-right: 5px; padding: 2px 2px;} box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1), 0 0 0 0 rgba(0, 0, 0, 0.14), 0 0 0 0 rgba(0, 0, 0, 0.12);
    .close-mdselect{right: 9px; position: absolute; top: 17px;} padding-left: 10.667px;
    .search-spacingleft{height: 48px !important; padding-left: 5px;} height: 48px;
    .header-spacing{padding-left: 0px !important;} cursor: pointer;
/* Styles added*/ position: relative;
display: flex;
\ No newline at end of file align-items: center;
width: auto;
}
.selectdemoSelectHeader md-content._md {
max-height: 240px;
}
.leads-data {
border: 1px solid #ccc;
padding: 5px 10px;
float: left;
width: 100%;
}
.leads-data p {
float: left;
width: auto;
background: #ccc;
margin-right: 5px;
padding: 2px 2px;
}
.close-mdselect {
right: 9px;
position: absolute;
top: 17px;
}
.search-spacingleft {
height: 48px !important;
padding-left: 5px;
}
.header-spacing {
padding-left: 0px !important;
}
/* Styles added*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment