Merge pull request #615 from cmv/feature/make-flat-theme-the-default

Make dojo flat the default theme
cmv · Oct 6, 2016 · efc0ee8 · efc0ee8
2 parents 0568dd9 + 9300b26
commit efc0ee8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/viewer/css/cmv-theme-overrides.css b/viewer/css/cmv-theme-overrides.css
@@ -4,6 +4,7 @@
 
 .cmv .dijitTitlePane {
     margin-bottom: 2px;
+    background-color: #FFF;
 }
 
 .cmv .dijitTitlePaneTitle {
@@ -191,7 +192,6 @@
 
 .flat .dijitTitlePaneTitle {
     border: 1px solid #DDD;
-    border-bottom: none;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     padding: 8px 15px;

diff --git a/viewer/index.html b/viewer/index.html
@@ -12,12 +12,12 @@
         <link rel="shortcut icon" href="./favicon.png">
         <title>Configurable Map Viewer</title>
         <link rel="stylesheet" type="text/css" href="https://js.arcgis.com/3.18compact/esri/css/esri.css">
-        <link rel="stylesheet" type="text/css" href="css/theme/dbootstrap/dbootstrap.css">
+        <link rel="stylesheet" type="text/css" href="css/theme/flat/flat.css">
         <link rel="stylesheet" type="text/css" href="css/cmv-theme-overrides.css">
         <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
         <link rel="stylesheet" type="text/css" href="css/main.css">
     </head>
-    <body class="cmv dbootstrap">
+    <body class="cmv flat">
         <div class="appHeader">
             <div class="headerLogo">
                 <img alt="logo" src="images/rocket-logo.png" height="54" />