diff --git a/.travis.yml b/.travis.yml
index 143d82dc..5b6fd9cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,13 @@ addons:
- llvm-toolchain-precise-3.6
- llvm-toolchain-precise-3.7
- llvm-toolchain-precise-3.8
+ - llvm-toolchain-precise-3.9
matrix:
+ allow_failures:
+ - compiler: clang++
+ env: CXX_VERSION=3.9
+
exclude:
- env: BOGUS_JOB=true
@@ -124,11 +129,13 @@ before_install:
if [[ -n "${TRAVIS_TAG}" ]]
then
METAL_VERSION="${TRAVIS_TAG}"
+ METAL_VERSION_EXACT=true
else
METAL_VERSION=$( \
curl -Ls https://github.com/brunocodutra/metal/tags | \
awk '/tag-name/{print $3;exit}' FS='[<>]' \
)
+ METAL_VERSION_EXACT=false
fi
- METAL_VERSION="${METAL_VERSION%%-*}"
@@ -160,12 +167,8 @@ before_script:
- (cd "${METAL_BUILD_PATH}" && cmake "${METAL_SOURCE_PATH}" ${CMAKE_ARGS[@]} && make install)
- CMAKE_ARGS+=("-DCMAKE_PREFIX_PATH=${METAL_INSTALL_PATH}")
- - |
- if [[ -n "${METAL_VERSION}" ]]
- then
- CMAKE_ARGS+=("-DMETAL_VERSION=${METAL_VERSION}")
- fi
-
+ - CMAKE_ARGS+=("-DMETAL_VERSION=${METAL_VERSION}")
+ - CMAKE_ARGS+=("-DMETAL_VERSION_EXACT=${METAL_VERSION_EXACT}")
- |
if [[ "${BUILD_DOC}" != "true" ]]
then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4494301..74d28d5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,128 +6,10 @@ cmake_minimum_required(VERSION 2.8.12)
project(Metal CXX)
-set(METAL_MAJOR_VERSION 0)
-set(METAL_MINOR_VERSION 2)
-set(METAL_PATCH_VERSION 0)
-set(
- METAL_VERSION
- ${METAL_MAJOR_VERSION}.${METAL_MINOR_VERSION}.${METAL_PATCH_VERSION}
-)
-
-if(WIN32 AND NOT CYGWIN)
- set(METAL_CMAKE_INSTALL_DIR_DEF CMake)
-else()
- set(METAL_CMAKE_INSTALL_DIR_DEF lib/cmake/Metal)
-endif()
-
-set(METAL_CMAKE_INSTALL_DIR
- ${METAL_CMAKE_INSTALL_DIR_DEF} CACHE PATH
- "installation directory for Metal CMake files"
-)
-
-set(METAL_INCLUDE_INSTALL_DIR
- include CACHE PATH
- "installation directory for Metal header files"
-)
-
-option(METAL_VERBOSE "increase output verbosity" OFF)
-option(METAL_ENABLE_BASIC_WARNINGS "enable basic compiler warnings" OFF)
-option(METAL_ENABLE_EXTRA_WARNINGS "enable extra compiler warnings" OFF)
-option(METAL_STRICT "treat compiler warnings as errors" OFF)
-
-if(METAL_ENABLE_EXTRA_WARNINGS)
- set(METAL_ENABLE_BASIC_WARNINGS ON)
-endif()
-
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-include(metal)
-
-if(METAL_VERBOSE)
- metal_try_add_flag(-v)
- metal_try_add_flag(-ftemplate-backtrace-limit=0)
- metal_try_add_flag(-fdiagnostics-show-template-tree)
- metal_try_add_flag(-fno-elide-type)
-endif()
-
-if(METAL_ENABLE_BASIC_WARNINGS)
- metal_try_add_flag(-W)
- metal_try_add_flag(-Wall)
- metal_try_add_flag(/W3)
-endif()
-
-if(METAL_ENABLE_EXTRA_WARNINGS)
- metal_try_add_flag(-Wextra)
- metal_try_add_flag(-Weverything)
- metal_try_add_flag(-Wno-c++98-compat)
- metal_try_add_flag(-Wno-c++98-compat-pedantic)
- metal_try_add_flag(-Wno-documentation)
- metal_try_add_flag(-Wno-documentation-unknown-command)
- metal_try_add_flag(/W4)
-endif()
-
-if(METAL_STRICT)
- metal_try_add_flag(-pedantic-errors)
- metal_try_add_flag(-Werror)
- metal_try_add_flag(/Za)
- metal_try_add_flag(/WX)
-endif()
-
-foreach(dialect
- -std=c++17 -std=c++1z
- -std=c++14 -std=c++1y
- /std:c++latest
-)
- metal_try_add_flag(${dialect} result)
- if(${result})
- break()
- endif()
-endforeach()
-
-set(METAL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-
-include_directories("${METAL_INCLUDE_DIR}")
-
-enable_testing()
+include("${CMAKE_SOURCE_DIR}/cmake/config.cmake")
+include("${CMAKE_SOURCE_DIR}/cmake/testing.cmake")
+include("${CMAKE_SOURCE_DIR}/cmake/deployment.cmake")
add_subdirectory(doc)
add_subdirectory(example)
add_subdirectory(test)
-
-foreach(_ INCLUDE CMAKE)
- if(NOT IS_ABSOLUTE "${METAL_${_}_INSTALL_DIR}")
- set(
- METAL_${_}_INSTALL_DIR
- "${CMAKE_INSTALL_PREFIX}/${METAL_${_}_INSTALL_DIR}"
- )
- endif()
-endforeach()
-
-file(
- RELATIVE_PATH METAL_INCLUDE_DIRS_CONF
- "${METAL_CMAKE_INSTALL_DIR}" "${METAL_INCLUDE_INSTALL_DIR}"
-)
-
-set(METAL_INCLUDE_DIRS_CONF "\${METAL_CMAKE_DIR}/${METAL_INCLUDE_DIRS_CONF}")
-configure_file(
- cmake/MetalConfig.cmake.in
- "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfig.cmake"
- @ONLY
-)
-
-configure_file(
- cmake/MetalConfigVersion.cmake.in
- "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfigVersion.cmake"
- @ONLY
-)
-
-install(
- DIRECTORY "${METAL_INCLUDE_DIR}"
- DESTINATION "${METAL_INCLUDE_INSTALL_DIR}"
-)
-
-install(
- FILES
- "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfig.cmake"
- "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfigVersion.cmake"
- DESTINATION "${METAL_CMAKE_INSTALL_DIR}"
-)
diff --git a/cmake/MetalConfig.cmake.in b/cmake/MetalConfig.cmake.in
index e4604699..36549d57 100644
--- a/cmake/MetalConfig.cmake.in
+++ b/cmake/MetalConfig.cmake.in
@@ -7,4 +7,4 @@
# METAL_INCLUDE_DIRS - include directories for Metal
get_filename_component(METAL_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-set(METAL_INCLUDE_DIRS "@METAL_INCLUDE_DIRS_CONF@")
+set(METAL_INCLUDE_DIRS "@METAL_INCLUDE_DIRS@")
diff --git a/cmake/config.cmake b/cmake/config.cmake
new file mode 100644
index 00000000..1c46c21c
--- /dev/null
+++ b/cmake/config.cmake
@@ -0,0 +1,78 @@
+# Copyright Bruno Dutra 2015-2016
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
+
+set(METAL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/")
+
+file(STRINGS "${METAL_INCLUDE_DIR}/metal/config/version.hpp"
+ METAL_CONFIG_VERSION_HPP REGEX "METAL_[A-Z]+ [0-9]+" LIMIT_COUNT 3
+)
+
+LIST(GET METAL_CONFIG_VERSION_HPP 0 METAL_MAJOR)
+LIST(GET METAL_CONFIG_VERSION_HPP 1 METAL_MINOR)
+LIST(GET METAL_CONFIG_VERSION_HPP 2 METAL_PATCH)
+
+string(REGEX REPLACE ".*MAJOR ([0-9]+).*" "\\1" METAL_MAJOR "${METAL_MAJOR}")
+string(REGEX REPLACE ".*MINOR ([0-9]+).*" "\\1" METAL_MINOR "${METAL_MINOR}")
+string(REGEX REPLACE ".*PATCH ([0-9]+).*" "\\1" METAL_PATCH "${METAL_PATCH}")
+
+set(METAL_VERSION "${METAL_MAJOR}.${METAL_MINOR}.${METAL_PATCH}")
+
+message(STATUS "Configuring Metal ${METAL_VERSION}")
+
+option(METAL_ENABLE_WARNINGS "enable compiler warnings" ON)
+option(METAL_STRICT "treat compiler warnings as errors" OFF)
+option(METAL_VERBOSE "increase output verbosity" OFF)
+
+include(CheckCXXCompilerFlag)
+function(metal_try_add_flag _flag)
+ set(result "${_flag}")
+ string(TOUPPER "${result}" result)
+ string(REGEX REPLACE "[+]" "X" result "${result}")
+ string(REGEX REPLACE "[-/;=]" "_" result "${result}")
+ string(REGEX REPLACE "[^ A-Z_0-9]" "" result "${result}")
+ string(REGEX REPLACE "^[ ]*([A-Z_0-9]+) ?.*$" "\\1" result "${result}")
+ set(result "HAS${result}")
+
+ check_cxx_compiler_flag(${_flag} ${result})
+ if(${result})
+ add_compile_options(${_flag})
+ endif()
+
+ if(ARGN)
+ set(${ARGN} ${result} PARENT_SCOPE)
+ endif()
+endfunction()
+
+if(METAL_ENABLE_WARNINGS)
+ metal_try_add_flag(-W)
+ metal_try_add_flag(-Wall)
+ metal_try_add_flag(-Wextra)
+ metal_try_add_flag(-Weverything)
+ metal_try_add_flag(-Wno-c++98-compat)
+ metal_try_add_flag(-Wno-c++98-compat-pedantic)
+ metal_try_add_flag(-Wno-documentation)
+ metal_try_add_flag(-Wno-documentation-unknown-command)
+ metal_try_add_flag(/W3)
+endif()
+
+if(METAL_STRICT)
+ metal_try_add_flag(-pedantic-errors)
+ metal_try_add_flag(-Werror)
+ metal_try_add_flag(/Za)
+ metal_try_add_flag(/WX)
+endif()
+
+if(METAL_VERBOSE)
+ metal_try_add_flag(-v)
+ metal_try_add_flag(-ftemplate-backtrace-limit=0)
+ metal_try_add_flag(-fdiagnostics-show-template-tree)
+ metal_try_add_flag(-fno-elide-type)
+endif()
+
+foreach(dialect -std=c++17 -std=c++1z -std=c++14 -std=c++1y /std:c++latest)
+ metal_try_add_flag(${dialect} result)
+ if(${result})
+ break()
+ endif()
+endforeach()
diff --git a/cmake/deployment.cmake b/cmake/deployment.cmake
new file mode 100644
index 00000000..3f4a13e7
--- /dev/null
+++ b/cmake/deployment.cmake
@@ -0,0 +1,52 @@
+# Copyright Bruno Dutra 2015-2016
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
+
+if(WIN32 AND NOT CYGWIN)
+ set(METAL_CMAKE_INSTALL_DIR_DEF CMake)
+else()
+ set(METAL_CMAKE_INSTALL_DIR_DEF lib/cmake/Metal)
+endif()
+
+set(METAL_CMAKE_INSTALL_DIR ${METAL_CMAKE_INSTALL_DIR_DEF} CACHE PATH
+ "installation directory for Metal CMake files"
+)
+
+set(METAL_INCLUDE_INSTALL_DIR include CACHE PATH
+ "installation directory for Metal header files"
+)
+
+foreach(_ INCLUDE CMAKE)
+ if(NOT IS_ABSOLUTE "${METAL_${_}_INSTALL_DIR}")
+ set(METAL_${_}_INSTALL_DIR
+ "${CMAKE_INSTALL_PREFIX}/${METAL_${_}_INSTALL_DIR}"
+ )
+ endif()
+endforeach()
+
+file(RELATIVE_PATH METAL_INCLUDE_DIRS
+ "${METAL_CMAKE_INSTALL_DIR}" "${METAL_INCLUDE_INSTALL_DIR}"
+)
+
+set(METAL_INCLUDE_DIRS "\${METAL_CMAKE_DIR}/${METAL_INCLUDE_DIRS}")
+
+configure_file(cmake/MetalConfig.cmake.in
+ "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfig.cmake"
+ @ONLY
+)
+
+configure_file(cmake/MetalConfigVersion.cmake.in
+ "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfigVersion.cmake"
+ @ONLY
+)
+
+install(DIRECTORY
+ "${METAL_INCLUDE_DIR}"
+ DESTINATION "${METAL_INCLUDE_INSTALL_DIR}"
+)
+
+install(FILES
+ "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfig.cmake"
+ "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/MetalConfigVersion.cmake"
+ DESTINATION "${METAL_CMAKE_INSTALL_DIR}"
+)
diff --git a/cmake/metal.cmake b/cmake/testing.cmake
similarity index 62%
rename from cmake/metal.cmake
rename to cmake/testing.cmake
index 63d137c8..a084e9b1 100644
--- a/cmake/metal.cmake
+++ b/cmake/testing.cmake
@@ -2,28 +2,9 @@
# Distributed under the Boost Software License, Version 1.0.
# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-include(CheckCXXCompilerFlag)
+enable_testing()
-function(metal_try_add_flag _flag)
- set(result "${_flag}")
- string(TOUPPER "${result}" result)
- string(REGEX REPLACE "[+]" "X" result "${result}")
- string(REGEX REPLACE "[-/;=]" "_" result "${result}")
- string(REGEX REPLACE "[^ A-Z_0-9]" "" result "${result}")
- string(REGEX REPLACE "^[ ]*([A-Z_0-9]+) ?.*$" "\\1" result "${result}")
- set(result "HAS${result}")
-
- check_cxx_compiler_flag(${_flag} ${result})
- if(${result})
- add_compile_options(${_flag})
- endif()
-
- if(ARGN)
- set(${ARGN} ${result} PARENT_SCOPE)
- endif()
-endfunction()
-
-function(metal_add_test_tree _root _prefix)
+function(metal_build_test_tree _root _prefix)
if(NOT TARGET ${_root})
message(FATAL_ERROR "'${_root}' is not a target.")
endif()
@@ -55,11 +36,10 @@ function(metal_add_test_tree _root _prefix)
add_dependencies(${_root} ${target})
if(IS_DIRECTORY "${_prefix}/${node}")
- metal_add_test_tree(${target} "${_prefix}/${node}")
+ metal_build_test_tree(${target} "${_prefix}/${node}")
endif()
- add_test(
- NAME ${target}
+ add_test(NAME ${target}
COMMAND ${CMAKE_COMMAND} --build . --target ${target}
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 5ee6cf86..f2205f9f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -11,7 +11,9 @@ endif()
configure_file(Doxyfile.in METAL_DOXYFILE @ONLY)
add_custom_target(doc
- COMMAND ${CMAKE_COMMAND} -E remove_directory html
+ COMMAND ${CMAKE_COMMAND} -E remove_directory "html"
COMMAND ${DOXYGEN_EXECUTABLE} METAL_DOXYFILE
- COMMENT "building documentation..."
+ COMMAND ${CMAKE_COMMAND} -E remove
+ "html/*.png" "html/dir_*.html" "html/namespacemetal.html"
+ "html/dynsections.js" "html/doxygen.css" "html/tabs.css"
)
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 40cf283f..3e6ada9e 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -253,7 +253,7 @@ ALIASES +=semantics="\par Semantics"
ALIASES +=tip{1}=""
ALIASES +=note{1}=""
-ALIASES +=danger{1}=""
+ALIASES +=warning{1}=""
# This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class"
@@ -500,7 +500,7 @@ HIDE_UNDOC_CLASSES = YES
# included in the documentation.
# The default value is: NO.
-HIDE_FRIEND_COMPOUNDS = NO
+HIDE_FRIEND_COMPOUNDS = YES
# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
# documentation blocks found inside the body of a function. If set to NO, these
@@ -543,7 +543,7 @@ HIDE_COMPOUND_REFERENCE= YES
# the files that are included by a file in the documentation of that file.
# The default value is: YES.
-SHOW_INCLUDE_FILES = YES
+SHOW_INCLUDE_FILES = NO
# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
# grouped member an include statement to the documentation, telling the reader
@@ -589,7 +589,7 @@ SORT_BRIEF_DOCS = YES
# detailed member documentation.
# The default value is: NO.
-SORT_MEMBERS_CTORS_1ST = NO
+SORT_MEMBERS_CTORS_1ST = YES
# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
# of group names into alphabetical order. If set to NO the group names will
@@ -672,7 +672,7 @@ SHOW_USED_FILES = NO
# (if specified).
# The default value is: YES.
-SHOW_FILES = YES
+SHOW_FILES = NO
# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
# page. This will remove the Namespaces entry from the Quick Index and from the
@@ -805,7 +805,7 @@ INPUT_ENCODING = UTF-8
# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
# *.qsf, *.as and *.js.
-FILE_PATTERNS = *.hpp *.md *.dox
+FILE_PATTERNS = *.hpp *.md
# The RECURSIVE tag can be used to specify whether or not subdirectories should
# be searched for input files as well.
@@ -853,7 +853,7 @@ EXCLUDE_SYMBOLS = detail
# that contain example code fragments that are included (see the \include
# command).
-EXAMPLE_PATH = @Metal_SOURCE_DIR@/example
+EXAMPLE_PATH = @Metal_SOURCE_DIR@/example/src
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
@@ -1007,7 +1007,7 @@ USE_HTAGS = NO
# See also: Section \class.
# The default value is: YES.
-VERBATIM_HEADERS = YES
+VERBATIM_HEADERS = NO
#---------------------------------------------------------------------------
# Configuration options related to the alphabetical class index
@@ -1025,7 +1025,7 @@ ALPHABETICAL_INDEX = YES
# Minimum value: 1, maximum value: 20, default value: 5.
# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-COLS_IN_ALPHA_INDEX = 5
+COLS_IN_ALPHA_INDEX = 1
# In case all classes in a project start with a common prefix, all classes will
# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
@@ -1122,15 +1122,15 @@ HTML_EXTRA_STYLESHEET =
# files will be copied as-is; there are no commands or markers available.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_EXTRA_FILES = @Metal_SOURCE_DIR@/doc/css/octicons.css \
- @Metal_SOURCE_DIR@/doc/icons/octicons.eot \
+HTML_EXTRA_FILES = @Metal_SOURCE_DIR@/doc/icons/octicons.eot \
@Metal_SOURCE_DIR@/doc/icons/octicons.svg \
@Metal_SOURCE_DIR@/doc/icons/octicons.ttf \
@Metal_SOURCE_DIR@/doc/icons/octicons.woff \
- @Metal_SOURCE_DIR@/doc/js/jquery-1.11.3.min.js \
@Metal_SOURCE_DIR@/doc/css/bootstrap.min.css \
- @Metal_SOURCE_DIR@/doc/js/bootstrap.min.js \
+ @Metal_SOURCE_DIR@/doc/css/octicons.css \
@Metal_SOURCE_DIR@/doc/css/metal.css \
+ @Metal_SOURCE_DIR@/doc/js/bootstrap.min.js \
+ @Metal_SOURCE_DIR@/doc/js/jquery.js \
@Metal_SOURCE_DIR@/doc/js/metal.js \
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
@@ -1169,7 +1169,7 @@ HTML_COLORSTYLE_GAMMA = 101
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_TIMESTAMP = YES
+HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
@@ -1190,7 +1190,7 @@ HTML_DYNAMIC_SECTIONS = NO
# Minimum value: 0, maximum value: 9999, default value: 100.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_INDEX_NUM_ENTRIES = 100
+HTML_INDEX_NUM_ENTRIES = 0
# If the GENERATE_DOCSET tag is set to YES, additional index files will be
# generated that can be used as input for Apple's Xcode 3 integrated development
@@ -1991,14 +1991,14 @@ EXPAND_ONLY_PREDEF = NO
# The default value is: YES.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-SEARCH_INCLUDES = YES
+SEARCH_INCLUDES = NO
# The INCLUDE_PATH tag can be used to specify one or more directories that
# contain include files that are not input files but should be processed by the
# preprocessor.
# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-INCLUDE_PATH = @Metal_SOURCE_DIR@/include
+INCLUDE_PATH =
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -2189,7 +2189,7 @@ COLLABORATION_GRAPH = NO
# The default value is: YES.
# This tag requires that the tag HAVE_DOT is set to YES.
-GROUP_GRAPHS = YES
+GROUP_GRAPHS = NO
# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
# collaboration diagrams in a style similar to the OMG's Unified Modeling
diff --git a/doc/css/metal.css b/doc/css/metal.css
index 59fefe91..bb1e0669 100644
--- a/doc/css/metal.css
+++ b/doc/css/metal.css
@@ -26,12 +26,34 @@ html, body {
#content {
height: auto;
min-height: 100%;
- padding-top: 60px;
- padding-bottom: 100px;
- margin-bottom: -100px;
+ padding-top: 55px;
+ padding-bottom: 140px;
+ margin-bottom: -140px;
}
-#toolbar > * {
+@media (max-width: 767px) {
+ #content {
+ padding-top: 110px;
+ }
+}
+
+#footer {
+ height: 100px;
+ font-size: 0.9em;
+ text-align: center;
+ margin-top: 40px;
+ padding-top: 20px;
+ border-top: 1px solid #EEEEEE;
+}
+
+.github-btn {
+ overflow: hidden;
+ border: 0px none;
+ height: 20px;
+ width: 102px;
+}
+
+.toolbar > * {
border-bottom: 1px solid #EEEEEE;
}
@@ -74,17 +96,18 @@ html, body {
}
h1:hover > a.anchor:after,
-h2:hover > a.anchor:after {
+h2:hover > a.anchor:after,
+h3:hover > a.anchor:after {
content: "ยง";
position: absolute;
- visibility: visible;
width: 1em;
- height: 1em;
left: -1em;
top: 65px;
cursor: pointer;
- text-align: center;
- vertical-align: middle;
+}
+
+.page-header + .sub-page-header {
+ margin-top: -15px;
}
a:not([href]) {
@@ -106,7 +129,8 @@ p {
}
.index-entry {
- margin-left: 20px;
+ padding-bottom: 9px;
+ border-bottom: 1px solid #eee;
}
.doxtable th,
@@ -169,28 +193,10 @@ dl.section.user dd {
margin-left: 20px;
}
-span.octicon {
- margin-right: 5px;
+i.octicon {
+ margin-right: 10px;
}
.strike {
text-decoration: line-through;
}
-
-#footer {
- height: 100px;
- font-size: 0.9em;
- text-align: center;
- padding-top: 20px;
- border-top: 1px solid #EEEEEE;
-}
-
-.social-btns .social-btn {
- display: inline-block;
- margin: 0;
-}
-
-.github-btn {
- overflow: hidden;
- border: 0px none;
-}
diff --git a/doc/footer.html b/doc/footer.html
index 33b4d7c9..1c2776db 100644
--- a/doc/footer.html
+++ b/doc/footer.html
@@ -5,13 +5,9 @@
-
- -
-
-
- -
-
-
+
© Copyright 2015
Bruno Dutra,
@@ -23,9 +19,24 @@
-
-
-
-
+